Revision 2cecea08 src/connection.cpp

View differences:

src/connection.cpp
32 32
#include <cerrno>
33 33
#include <ctime>
34 34
#include <algorithm>
35
#include <cassert>
35 36

  
36 37
Connection::Connection(TunerManager *tm, int dataFD)
37 38
  : dataFD(dataFD), priority(0), 
......
69 70
bool Connection::doSubscribe()
70 71
{
71 72
  bool result = true;
73
  int n = 0;
72 74

  
73
  for (DemuxerList::iterator i = demuxers.begin(); i != demuxers.end(); i++)
75
  for (DemuxerList::iterator i = demuxers.begin(); i != demuxers.end(); i++) 
74 76
    result = (*i)->subscribe(this) && result;
75

  
77
   
76 78
  if (!result) {
77 79
    doUnsubscribe();
78 80
    return false;
79 81
  }
82

  
80 83
  return true;
81 84
}
82 85

  
......
196 199
    SavePriority save(this, p - 1);
197 200

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

  
202 205
    if (newDemuxers.empty()) 

Also available in: Unified diff