do not store default values in cache
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Tue, 16 May 2006 15:19:54 +0000 (15:19 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Tue, 16 May 2006 15:19:54 +0000 (15:19 +0000)
lib/service/servicedvb.cpp

index 0ec488f..b99357c 100644 (file)
@@ -1203,6 +1203,8 @@ RESULT eDVBServicePlay::getTrackInfo(struct iAudioTrackInfo &info, unsigned int
                info.m_description = "MPEG";
        else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAC3)
                info.m_description = "AC3";
                info.m_description = "MPEG";
        else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAC3)
                info.m_description = "AC3";
+       else if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atAAC)
+               info.m_description = "AAC";
        else  if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atDTS)
                info.m_description = "DTS";
        else
        else  if (program.audioStreams[i].type == eDVBServicePMTHandler::audioStream::atDTS)
                info.m_description = "DTS";
        else
@@ -1699,7 +1701,7 @@ void eDVBServicePlay::updateDecoder()
                                m_dvb_service->setCacheEntry(eDVBService::cAC3PID, apid);
                        }
                        m_dvb_service->setCacheEntry(eDVBService::cVPID, vpid);
                                m_dvb_service->setCacheEntry(eDVBService::cAC3PID, apid);
                        }
                        m_dvb_service->setCacheEntry(eDVBService::cVPID, vpid);
-                       m_dvb_service->setCacheEntry(eDVBService::cVTYPE, vpidtype);
+                       m_dvb_service->setCacheEntry(eDVBService::cVTYPE, vpidtype == eDVBVideo::MPEG2 ? -1 : vpidtype);
                        m_dvb_service->setCacheEntry(eDVBService::cPCRPID, pcrpid);
                        m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid);
                }
                        m_dvb_service->setCacheEntry(eDVBService::cPCRPID, pcrpid);
                        m_dvb_service->setCacheEntry(eDVBService::cTPID, tpid);
                }