From b52a614903cab3c3b8d1a1eae871d3bdefa926ce Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Tue, 22 Apr 2008 16:31:47 +0000 Subject: [PATCH] some dvd player changes (resume isnt working yet) --- .../Plugins/Extensions/DVDPlayer/plugin.py | 15 ++ .../Extensions/DVDPlayer/src/servicedvd.cpp | 175 +++++------------- .../Extensions/DVDPlayer/src/servicedvd.h | 45 +---- 3 files changed, 63 insertions(+), 172 deletions(-) diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py index fd048695..a44d042b 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py +++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py @@ -339,10 +339,12 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarC def __menuOpened(self): self.hide() self.in_menu = True + self["NumberActions"].setEnabled(False) def __menuClosed(self): self.show() self.in_menu = False + self["NumberActions"].setEnabled(True) def setChapterLabel(self): chapterLCD = "Menu" @@ -529,6 +531,12 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarC self.restore_infobar_seek_config() self.session.nav.playService(self.oldService) + def playLastCB(self, answer): # overwrite infobar cuesheet function + print "playLastCB", answer, self.resume_point +# if answer == True: +# self.doSeek(self.resume_point) + self.hideAfterResume() + def showAfterCuesheetOperation(self): if not self.in_menu: self.show() @@ -537,6 +545,13 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarC print "DVDCreateSummary" return DVDSummary +#override some InfoBarSeek functions + def doEof(self): + self.setSeekState(self.SEEK_STATE_PLAY) + + def calcRemainingTime(self): + return 0 + def main(session, **kwargs): session.open(DVDPlayer) diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp index 016e16a1..12d14051 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp @@ -10,13 +10,11 @@ #include #include -#ifdef cue #include #include #ifndef BYTE_ORDER #error no byte order defined! #endif -#endif //cue extern "C" { #include @@ -105,11 +103,7 @@ eServiceDVD::eServiceDVD(const char *filename): CONNECT(m_sn.activated, eServiceDVD::gotMessage); CONNECT(m_pump.recv_msg, eServiceDVD::gotThreadMessage); strcpy(m_ddvd_titlestring,""); - m_doSeekTo = 0; - m_seekTitle = 0; -#ifdef cue m_cue_pts = 0; -#endif } void eServiceDVD::gotThreadMessage(const int &msg) @@ -203,7 +197,6 @@ void eServiceDVD::gotMessage(int what) eDebug("DVD_EOF_REACHED!"); m_event(this, evEOF); break; - case DDVD_SOF_REACHED: eDebug("DVD_SOF_REACHED!"); m_event(this, evSOF); @@ -212,25 +205,19 @@ void eServiceDVD::gotMessage(int what) { static struct ddvd_time last_info; struct ddvd_time info; + eDebug("DVD_SHOWOSD_TIME!"); ddvd_get_last_time(m_ddvdconfig, &info); int spu_id; uint16_t spu_lang; ddvd_get_last_spu(m_ddvdconfig, &spu_id, &spu_lang); if ( info.pos_chapter != last_info.pos_chapter ) { - eDebug("DVD_SHOWOSD_TIME!"); m_event(this, evUser+8); // chapterUpdated } - if ( info.pos_title != last_info.pos_title ) + if ( info.pos_title != last_info.pos_title ) { m_event(this, evUser+9); // titleUpdated } - if ( info.pos_title == m_seekTitle && m_doSeekTo ) - { - seekRelative( +1, m_doSeekTo ); - m_doSeekTo = 0; - m_seekTitle = 0; - } ddvd_get_last_time(m_ddvdconfig, &last_info); break; } @@ -240,16 +227,18 @@ void eServiceDVD::gotMessage(int what) eDebug("DDVD_SHOWOSD_TITLESTRING: %s",m_ddvd_titlestring); loadCuesheet(); m_event(this, evStart); -// m_event((iPlayableService*)this, evUpdatedEventInfo); -// m_event(this, evUser+10); break; } case DDVD_MENU_OPENED: eDebug("DVD_MENU_OPENED!"); + m_state = stMenu; + m_event(this, evSeekableStatusChanged); m_event(this, evUser+11); break; case DDVD_MENU_CLOSED: eDebug("DVD_MENU_CLOSED!"); + m_state = stRunning; + m_event(this, evSeekableStatusChanged); m_event(this, evUser+12); break; default: @@ -288,7 +277,6 @@ RESULT eServiceDVD::stop() eDebug("DVD: stop %s", m_filename.c_str()); m_state = stStopped; ddvd_send_key(m_ddvdconfig, DDVD_KEY_EXIT); -#ifdef cue struct ddvd_time info; ddvd_get_last_time(m_ddvdconfig, &info); if ( info.pos_chapter < info.end_chapter ) @@ -300,10 +288,7 @@ RESULT eServiceDVD::stop() pos *= 90000; m_cue_pts = pos; } - else // last chapter - usually credits, don't save cue - m_cue_pts = 0; saveCuesheet(); -#endif return 0; } @@ -378,12 +363,14 @@ RESULT eServiceDVD::setFastForward(int trick) RESULT eServiceDVD::pause() { + eDebug("set pause!\n"); ddvd_send_key(m_ddvdconfig, DDVD_KEY_PAUSE); return 0; } RESULT eServiceDVD::unpause() { + eDebug("set unpause!\n"); ddvd_send_key(m_ddvdconfig, DDVD_KEY_PLAY); return 0; } @@ -440,7 +427,7 @@ int eServiceDVD::getInfo(int w) ddvd_get_last_time(m_ddvdconfig, &info); return info.end_chapter; } - + case evUser+9: { struct ddvd_time info; @@ -453,7 +440,7 @@ int eServiceDVD::getInfo(int w) ddvd_get_last_time(m_ddvdconfig, &info); return info.end_title; } - + case sTXTPID: // we abuse HAS_TELEXT icon in InfoBar to signalize subtitles status { int spu_id; @@ -570,26 +557,17 @@ RESULT eServiceDVD::getLength(pts_t &len) return 0; } -// RESULT eServiceDVD::seekTo(pts_t to) -// { -// struct ddvd_time info; -// to /= 90000; -// int cur; -// ddvd_get_last_time(m_ddvdconfig, &info); -// cur = info.pos_hours * 3600; -// cur += info.pos_minutes * 60; -// cur += info.pos_seconds; -// eDebug("seekTo %lld, cur %d, diff %lld", to, cur, cur - to); -// ddvd_skip_seconds(m_ddvdconfig, cur - to); -// return 0; -// } - RESULT eServiceDVD::seekTo(pts_t to) { - m_seekTitle = 1; - eDebug("seekTo %lld", to); - ddvd_set_title(m_ddvdconfig, m_seekTitle); - m_doSeekTo = to; + struct ddvd_time info; + to /= 90000; + int cur; + ddvd_get_last_time(m_ddvdconfig, &info); + cur = info.pos_hours * 3600; + cur += info.pos_minutes * 60; + cur += info.pos_seconds; + eDebug("seekTo %lld, cur %d, diff %lld", to, cur, cur - to); + ddvd_skip_seconds(m_ddvdconfig, cur - to); return 0; } @@ -614,6 +592,13 @@ RESULT eServiceDVD::getPlayPosition(pts_t &pos) return 0; } +RESULT eServiceDVD::seekTitle(int title) +{ + eDebug("setTitle %d", title); + ddvd_set_title(m_ddvdconfig, title); + return 0; +} + RESULT eServiceDVD::seekChapter(int chapter) { eDebug("setChapter %d", chapter); @@ -629,7 +614,7 @@ RESULT eServiceDVD::setTrickmode(int trick) RESULT eServiceDVD::isCurrentlySeekable() { - return 1; + return m_state == stRunning; } RESULT eServiceDVD::keyPressed(int key) @@ -681,7 +666,6 @@ RESULT eServiceDVD::keyPressed(int key) return 0; } -#ifdef cue RESULT eServiceDVD::cueSheet(ePtr &ptr) { if (m_cue_pts) @@ -695,74 +679,22 @@ RESULT eServiceDVD::cueSheet(ePtr &ptr) PyObject *eServiceDVD::getCutList() { - ePyObject list = PyList_New(0); - -// for (std::multiset::iterator i(m_cue_entries.begin()); i != m_cue_entries.end(); ++i) -// { - ePyObject tuple = PyTuple_New(2); -// PyTuple_SetItem(tuple, 0, PyLong_FromLongLong(i->where)); - PyTuple_SetItem(tuple, 0, PyLong_FromLongLong(m_cue_pts)); -// PyTuple_SetItem(tuple, 1, PyInt_FromLong(i->what)); - PyTuple_SetItem(tuple, 1, PyInt_FromLong(3)); - PyList_Append(list, tuple); - Py_DECREF(tuple); -// } - -// eDebug("eServiceDVD::getCutList() pts=%lld",m_cue_pts); - + ePyObject list = PyList_New(1); + ePyObject tuple = PyTuple_New(2); + PyTuple_SetItem(tuple, 0, PyLong_FromLongLong(m_cue_pts)); + PyTuple_SetItem(tuple, 1, PyInt_FromLong(3)); + PyList_SetItem(list, 0, tuple); return list; } void eServiceDVD::setCutList(ePyObject list) { - eDebug("eServiceDVD::setCutList()"); - - if (!PyList_Check(list)) - return; - int size = PyList_Size(list); - int i; - -// m_cue_entries.clear(); - - for (i=0; i 3) -// break; + what = ntohl(what); - m_cue_pts = where; - -// m_cue_entries.insert(cueEntry(where, what)); - } + m_cue_pts = where; fclose(f); -// eDebug("%d entries", m_cue_entries.size()); } else eDebug("cutfile not found!"); - - m_cuesheet_changed = 0; -// cutlistToCuesheet(); + eDebug("eServiceDVD::loadCuesheet() pts=%lld",m_cue_pts); if (m_cue_pts) @@ -827,27 +748,19 @@ void eServiceDVD::saveCuesheet() unsigned long long where; int what; -// for (std::multiset::iterator i(m_cue_entries.begin()); i != m_cue_entries.end(); ++i) { #if BYTE_ORDER == BIG_ENDIAN where = m_cue_pts; -// where = i->where; #else -// where = bswap_64(i->where); where = bswap_64(m_cue_pts); #endif -// what = htonl(i->what); what = 3; fwrite(&where, sizeof(where), 1, f); fwrite(&what, sizeof(what), 1, f); - } fclose(f); } - - m_cuesheet_changed = 0; } -#endif eAutoInitPtr init_eServiceFactoryDVD(eAutoInitNumbers::service+1, "eServiceFactoryDVD"); diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h index ed5d49bd..bc92b37e 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.h @@ -6,8 +6,6 @@ #include #include -#define cue - class eSubtitleWidget; class gPixmap; class eStaticServiceDVDInfo; @@ -29,10 +27,7 @@ public: }; class eServiceDVD: public iPlayableService, public iPauseableService, public iSeekableService, - public iServiceInformation, public iSubtitleOutput, public iServiceKeys, public eThread, public Object -#ifdef cue -, public iCueSheet -#endif + public iServiceInformation, public iSubtitleOutput, public iServiceKeys, public iCueSheet, public eThread, public Object { friend class eServiceFactoryDVD; DECLARE_REF(eServiceDVD); @@ -47,11 +42,7 @@ public: RESULT audioDelay(ePtr &ptr) { ptr = 0; return -1; } RESULT rdsDecoder(ePtr &ptr) { ptr = 0; return -1; } RESULT stream(ePtr &ptr) { ptr = 0; return -1; } -#ifdef cue RESULT cueSheet(ePtr &ptr); -#else - RESULT cueSheet(ePtr &ptr) { ptr = 0; return -1; } -#endif // iPlayableService RESULT connectEvent(const Slot2 &event, ePtr &connection); @@ -76,7 +67,6 @@ public: PyObject *getSubtitleList(); PyObject *getCachedSubtitle(); -#if 1 // iSeekableService RESULT getLength(pts_t &len); RESULT seekTo(pts_t to); @@ -85,7 +75,7 @@ public: RESULT setTrickmode(int trick=0); RESULT isCurrentlySeekable(); RESULT seekChapter(int chapter); -#endif + RESULT seekTitle(int title); // iServiceInformation RESULT getName(std::string &name); @@ -93,12 +83,11 @@ public: std::string getInfoString(int w); virtual PyObject *getInfoObject(int w); -#ifdef cue // iCueSheet PyObject *getCutList(); void setCutList(SWIG_PYOBJECT(ePyObject)); void setCutListEnable(int enable); -#endif + // iServiceKeys RESULT keyPressed(int key); private: @@ -121,46 +110,20 @@ private: enum { - stIdle, stRunning, stStopped, + stIdle, stRunning, stMenu, stStopped }; int m_state; int m_current_trick; - pts_t m_doSeekTo; - int m_seekTitle; char m_ddvd_titlestring[96]; eSocketNotifier m_sn; eFixedMessagePump m_pump; -#ifdef cue -// ePtr m_cue; -// -// struct cueEntry -// { -// pts_t where; -// unsigned int what; -// -// bool operator < (const struct cueEntry &o) const -// { -// return where < o.where; -// } -// cueEntry(const pts_t &where, unsigned int what) : -// where(where), what(what) -// { -// } -// }; - -// std::multiset m_cue_entries; - int m_cuesheet_changed, m_cutlist_enabled; pts_t m_cue_pts; - void loadCuesheet(); void saveCuesheet(); - -// void cutlistToCuesheet(); -#endif }; #endif -- 2.30.2