From 27af195d31298de858014931bdbe06fee1d244e4 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Fri, 27 Jun 2008 20:14:16 +0000 Subject: [PATCH] revert local changes --- lib/dvb/decoder.cpp | 5 ----- lib/python/Components/Makefile.am | 2 +- lib/service/servicedvb.cpp | 3 --- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp index 44031726..7ad1a25d 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 df8cf9fe..d3c51ab2 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 f13ae50e..307c317f 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 &ptr) { ePtr service; @@ -948,7 +946,6 @@ RESULT eServiceFactoryDVB::play(const eServiceReference &ref, ePtr