mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: improve TD LCD support in movieplayer

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2027 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2012-01-01 11:57:16 +00:00
parent 9d425a9074
commit b35a163e85
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/driver/lcdd.cpp
View File

@@ -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;

11
src/gui/movieplayer.cpp
View File

@@ -48,6 +48,11 @@
#include <zapit/zapit.h>
//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);