Revision 2cecea08 src/tunermanager.cpp

View differences:

src/tunermanager.cpp
180 180 
	  continue;
181 181 
      }
182 182 

  		




  183
  
  
    
      Demuxer *audio = t->getDemuxer(c->getAudioPID(), Demuxer::Audio);


  		




  184
  
  
    
      Demuxer *video = t->getDemuxer(c->getVideoPID(), Demuxer::Video);


  		




  
  183
  
    
      Demuxer *audio = t->getDemuxer(c->getAudioPID(), false, Demuxer::Audio);


  		




  
  184
  
    
      Demuxer *video = t->getDemuxer(c->getVideoPID(), false, Demuxer::Video);


  		




  185
  185
  
    

  		




  186
  186
  
    
      // Check to see if perhaps someone else has already


  		




  187
  187
  
    
      // tuned the audio or video channels (this should


  		




  ......




  205
  205
  
    
}


  		




  206
  206
  
    

  		




  207
  207
  
    
void TunerManager::getDemuxers(const std::string &type, const std::string &channel,


  		




  208
  
  
    
			       DemuxerList &demuxers, int priority) 


  		




  
  208
  
    
			       bool convertToPS, DemuxerList &demuxers, int priority) 


  		




  209
  209
  
    
{


  		




  210
  210
  
    
  TypeTunerMap::iterator li = typeTunerMap.find(type);


  		




  211
  211
  
    
  assert(li != typeTunerMap.end());


  		




  ......




  233
  233
  
    
      if (!t->getTuneParams()->sameAsExceptPIDs(*c)) 


  		




  234
  234
  
    
	continue;


  		




  235
  235
  
    

  		




  236
  
  
    
      Demuxer *audio = t->getDemuxer(c->getAudioPID(), Demuxer::Audio);


  		




  237
  
  
    
      Demuxer *video = t->getDemuxer(c->getVideoPID(), Demuxer::Video);


  		




  
  236
  
    
      Demuxer *audio = t->getDemuxer(c->getAudioPID(), convertToPS, Demuxer::Audio);


  		




  
  237
  
    
      Demuxer *video = t->getDemuxer(c->getVideoPID(), convertToPS, Demuxer::Video);


  		




  238
  238
  
    

  		




  239
  239
  
    
      // Check to see if perhaps someone else has already


  		




  240
  240
  
    
      // tuned the audio or video channels (this should


  		












Also available in:  Unified diff