← Back to branch summary

~ubuntu-branches/ubuntu/wily/me-tv/wily

« back to all changes in this revision

Viewing changes to src/stream_manager.cc

  • Committer: Bazaar Package Importer
  • Author(s): Michael Lamothe
  • Date: 2010-06-20 21:51:41 UTC
  • mfrom: (1.1.13 upstream) (3.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100620215141-jfzya7s0a5g8xxl4
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/stream_manager.cc
103
103
                g_debug("CHECKING: %s", frontend_thread.frontend.get_path().c_str());
104
104
                if (frontend_thread.frontend.get_path() == scheduled_recording.device)
105
105
                {
106
 
                        frontend_thread.start_recording(channel,
107
 
                            make_recording_filename(channel, scheduled_recording.description),
108
 
                            true);
 
106
                        frontend_thread.start_recording(channel, scheduled_recording.description, true);
109
107
                        found = true;
110
108
                }
111
109
        }
160
158
                            channel.transponder.frontend_parameters.frequency)
161
159
                        {
162
160
                                g_debug("Found a frontend already tuned to the correct transponder");
163
 
                                frontend_thread.start_recording(channel,
164
 
                                    make_recording_filename(channel),
165
 
                                    false);
166
 
                                
 
161
                                frontend_thread.start_recording(channel, channel.name, false);
167
162
                                found = true;
168
163
                                break;
169
164
                        }
183
178
                                if (frontend_thread.get_streams().empty())
184
179
                                {
185
180
                                        g_debug("Selected idle frontend '%s' for recording", frontend_thread.frontend.get_name().c_str());
186
 
                                        frontend_thread.start_recording(channel,
187
 
                                            make_recording_filename(channel),
188
 
                                            false);
 
181
                                        frontend_thread.start_recording(channel, channel.name, false);
189
182
                                        found = true;
190
183
                                        break;
191
184
                                }