diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-06-27 20:14:16 (GMT) |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-06-27 20:14:16 (GMT) |
| commit | 27af195d31298de858014931bdbe06fee1d244e4 (patch) | |
| tree | 2f64df2a22903ac0c8091a23436baa7f4f788a65 | |
| parent | 640a60618e00639f02c546f021ba67c454a49428 (diff) | |
revert local changes
| -rw-r--r-- | lib/dvb/decoder.cpp | 5 | ||||
| -rw-r--r-- | lib/python/Components/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/service/servicedvb.cpp | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index 4403172..7ad1a25 100644 --- a/lib/dvb/decoder.cpp +++ b/lib/dvb/decoder.cpp @@ -1007,12 +1007,7 @@ RESULT eTSMPEGDecoder::setSyncMaster(int who) RESULT eTSMPEGDecoder::start() { - timespec now, tmp; - extern timespec service_start; RESULT r; - clock_gettime(CLOCK_MONOTONIC, &now); - tmp = now - service_start; - eDebug("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! %d:%d", tmp.tv_sec, tmp.tv_nsec); r = setState(); if (r) return r; diff --git a/lib/python/Components/Makefile.am b/lib/python/Components/Makefile.am index df8cf9f..d3c51ab 100644 --- a/lib/python/Components/Makefile.am +++ b/lib/python/Components/Makefile.am @@ -18,4 +18,4 @@ install_PYTHON = \ MultiContent.py MediaPlayer.py TunerInfo.py VideoWindow.py ChoiceList.py \ Element.py Playlist.py ParentalControl.py ParentalControlList.py \ Ipkg.py SelectionList.py Scanner.py SystemInfo.py DreamInfoHandler.py \ - Task.py Thread.py + Task.py diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index f13ae50..307c317 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -939,8 +939,6 @@ RESULT eDVBServiceList::setListName(const std::string &name) return m_bouquet->setListName(name); } -timespec service_start; - RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableService> &ptr) { ePtr<eDVBService> service; @@ -948,7 +946,6 @@ RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr<iPlayableServ if (r) service = 0; // check resources... - clock_gettime(CLOCK_MONOTONIC, &service_start); ptr = new eDVBServicePlay(ref, service); return 0; } |