← Back to branch summary

~ubuntu-branches/debian/sid/me-tv/sid

« back to all changes in this revision

Viewing changes to src/channel_stream.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Lamothe
  • Date: 2010-06-20 21:51:41 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20100620215141-kuot8mtwihv6ugwm
Tags: 1.2.6-1
http://bugs.debian.org/575122
http://bugs.debian.org/582613
* New upstream release
* Fix "needs to depend on libxine1-x" updated control file to
  depend on ${xine-x:Depends} (Closes: #575122)
* Fix "EPG texts with ampersands not shown" encoded XML strings
  in GTK controls that use markup (Closes: #582613)
* Updated the description of the application to remove reference
  to MythTV

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/channel_stream.h
40
40
        Glib::StaticRecMutex                    mutex;
41
41
                
42
42
public:
43
 
        ChannelStream(ChannelStreamType type, Channel& channel, const Glib::ustring& filename);
 
43
        ChannelStream(ChannelStreamType type, Channel& channel, const Glib::ustring& filename,
 
44
                const Glib::ustring& description = "");
44
45
        ~ChannelStream();
45
46
 
46
47
        Glib::RefPtr<Glib::IOChannel>   output_channel;
47
48
        Mpeg::Stream                                    stream;
48
49
        Glib::ustring                                   filename;
 
50
        Glib::ustring                                   description;
49
51
        ChannelStreamType                               type;
50
52
        Channel&                                                channel;
51
53