diff --git a/src/driver/lcdd.cpp b/src/driver/lcdd.cpp index 4a8faa62e..90dbd6785 100644 --- a/src/driver/lcdd.cpp +++ b/src/driver/lcdd.cpp @@ -746,6 +746,31 @@ void CLCD::showPercentOver(const unsigned char perc, const bool perform_update, void CLCD::showMenuText(const int position, const char * text, const int highlight, const bool utf_encoded) { + /* hack, to not have to patch too much in movieplayer.cpp */ + if (mode == MODE_MOVIE) { + size_t p; + AUDIOMODES m = movie_playmode; + std::string mytext = text; + if (mytext.find("> ") == 0) { + mytext = mytext.substr(2); + m = AUDIO_MODE_PLAY; + } else if (mytext.find("|| ") == 0) { + mytext = mytext.substr(3); + m = AUDIO_MODE_PAUSE; + } else if ((p = mytext.find("s||> ")) < 3) { + mytext = mytext.substr(p + 5); + m = AUDIO_MODE_PLAY; + } else if ((p = mytext.find("x>> ")) < 3) { + mytext = mytext.substr(p + 4); + m = AUDIO_MODE_FF; + } else if ((p = mytext.find("x<< ")) < 3) { + mytext = mytext.substr(p + 4); + m = AUDIO_MODE_REV; + } + setMovieInfo(m, "", mytext, false); + return; + } + if (mode != MODE_MENU_UTF8) return; diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 487d18c82..6bb281cc9 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -48,6 +48,11 @@ #include //extern CPlugins *g_PluginList; +#if HAVE_TRIPLEDRAGON +#define LCD_MODE CVFD::MODE_MOVIE +#else +#define LCD_MODE CVFD::MODE_MENU_UTF8 +#endif extern cVideo * videoDecoder; extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */ @@ -244,7 +249,7 @@ void CMoviePlayerGui::updateLcd() break; } lcd += name; - CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8); + CVFD::getInstance()->setMode(LCD_MODE); CVFD::getInstance()->showMenuText(0, lcd.c_str(), -1, true); } @@ -442,6 +447,10 @@ void CMoviePlayerGui::PlayFile(void) if(playback->GetPosition(position, duration)) { if(duration > 100) file_prozent = (unsigned char) (position / (duration / 100)); +#if HAVE_TRIPLEDRAGON + CVFD::getInstance()->showPercentOver(file_prozent, true, CVFD::MODE_MOVIE); +#endif + playback->GetSpeed(speed); #ifdef DEBUG printf("CMoviePlayerGui::PlayFile: speed %d position %d duration %d (%d, %d%%)\n", speed, position, duration, duration-position, file_prozent);