Revision 59be6a47 src/connection.cpp

View differences:

src/connection.cpp
62 62

  
63 63
void Connection::doUnsubscribe()
64 64
{
65
  DemuxerList copy = demuxers;
66
  for (DemuxerList::iterator i = copy.begin(); i != copy.end(); i++)
65
  SourceList copy = demuxers;
66
  for (SourceList::iterator i = copy.begin(); i != copy.end(); i++)
67 67
    (*i)->unsubscribe(this);
68 68
}
69 69

  
......
72 72
  bool result = true;
73 73
  int n = 0;
74 74

  
75
  for (DemuxerList::iterator i = demuxers.begin(); i != demuxers.end(); i++) 
75
  for (SourceList::iterator i = demuxers.begin(); i != demuxers.end(); i++) 
76 76
    result = (*i)->subscribe(this) && result;
77 77
   
78 78
  if (!result) {
......
172 172
}
173 173

  
174 174

  
175
bool Connection::tune(const std::string &newType, const std::string &newChannel, int p)
175
bool Connection::tune(const std::string &newType, const std::string &newChannel, bool convertToPS, int p)
176 176
{
177 177
  if (tuned) {
178 178
    if (type == newType && channel == newChannel) {
......
191 191
  // be expected since the request is to change the channel!
192 192
  retuning = true;
193 193
  
194
  DemuxerList newDemuxers;
194
  SourceList newDemuxers;
195 195

  
196 196
  // Set the priority of the current channel
197 197
  // to be less than the specified priority
......
199 199
    SavePriority save(this, p - 1);
200 200

  
201 201
    // Try to allocate the new demuxers
202
    tm->getDemuxers(newType, newChannel, true, newDemuxers, p);
202
    tm->getDemuxers(newType, newChannel, convertToPS, newDemuxers, p);
203 203
    retuning = false;
204 204

  
205 205
    if (newDemuxers.empty()) 

Also available in: Unified diff