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

movieplayer: display approx. playback position in infobar

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@891 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2010-11-27 13:57:01 +00:00
parent d9488d8e77
commit 65b1e20a83
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/infoviewer.cpp
View File

@@ -472,7 +472,9 @@ void CInfoViewer::show_current_next(bool new_chan, int epgpos)
} }
} }
void CInfoViewer::showMovieTitle( const int playState, const std::string Channel, const std::string g_file_epg, const std::string g_file_epg1) void CInfoViewer::showMovieTitle(const int playState, const std::string Channel,
const std::string g_file_epg, const std::string g_file_epg1,
const int duration, const int curr_pos)
{ {
chack_channellogo_ca_SettingsChange(); chack_channellogo_ca_SettingsChange();
aspectRatio = 0; aspectRatio = 0;
@@ -517,7 +519,10 @@ void CInfoViewer::showMovieTitle( const int playState, const std::string Channel
char runningPercent = file_prozent; char runningPercent = file_prozent;
if (runningPercent > 100) if (runningPercent > 100)
runningPercent = 100; runningPercent = 100;
display_Info(g_file_epg.c_str(), g_file_epg1.c_str(), true, false, runningPercent);
char runningRest[32]; // %d can be 10 digits max...
sprintf(runningRest, "%d / %d min", (curr_pos + 30000) / 60000, (duration + 30000) / 60000);
display_Info(g_file_epg.c_str(), g_file_epg1.c_str(), true, false, runningPercent, NULL, runningRest);
const char *playicon = NULL; const char *playicon = NULL;
switch (playState) { switch (playState) {

4
src/gui/infoviewer.h
View File

@@ -151,7 +151,9 @@ class CInfoViewer
uint32_t lcdUpdateTimer; uint32_t lcdUpdateTimer;
CInfoViewer(); CInfoViewer();
void showMovieTitle( const int playState, const std::string Channel, const std::string g_file_epg, const std::string g_file_epg1); void showMovieTitle(const int playState, const std::string title,
const std::string g_file_epg, const std::string g_file_epg1,
const int duration, const int curr_pos);
void start(); void start();
void showEpgInfo(); void showEpgInfo();

22
src/gui/movieplayer.cpp
View File

@@ -945,7 +945,7 @@ void CMoviePlayerGui::PlayFile(void)
speed = 1; speed = 1;
playback->SetSpeed(speed); playback->SetSpeed(speed);
if (!timeshift) if (!timeshift)
callInfoViewer(p_movie_info->epgTitle, p_movie_info->epgInfo1, p_movie_info->epgChannel ); callInfoViewer(p_movie_info->epgTitle, p_movie_info->epgInfo1, p_movie_info->epgChannel, duration, position);
} else if (!timeshift) { } else if (!timeshift) {
open_filebrowser = true; open_filebrowser = true;
} }
@@ -962,17 +962,15 @@ void CMoviePlayerGui::PlayFile(void)
//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false); //CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false);
speed = 1; speed = 1;
playback->SetSpeed(speed); playback->SetSpeed(speed);
if (!timeshift )
callInfoViewer(p_movie_info->epgTitle, p_movie_info->epgInfo1, p_movie_info->epgChannel );
} else { } else {
playstate = CMoviePlayerGui::PAUSE; playstate = CMoviePlayerGui::PAUSE;
//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, true); //CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, true);
speed = 0; speed = 0;
playback->SetSpeed(speed); playback->SetSpeed(speed);
if (!timeshift)
callInfoViewer(p_movie_info->epgTitle, p_movie_info->epgInfo1, p_movie_info->epgChannel );
} }
if (!timeshift)
callInfoViewer(p_movie_info->epgTitle, p_movie_info->epgInfo1, p_movie_info->epgChannel, position, duration);
} else if (msg == (neutrino_msg_t) g_settings.mpkey_bookmark) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_bookmark) {
// is there already a bookmark activity? // is there already a bookmark activity?
if (isMovieBrowser != true) { if (isMovieBrowser != true) {
@@ -1103,7 +1101,7 @@ void CMoviePlayerGui::PlayFile(void)
update_lcd = true; update_lcd = true;
if (!timeshift) if (!timeshift)
callInfoViewer(p_movie_info->epgTitle, p_movie_info->epgInfo1, p_movie_info->epgChannel ); callInfoViewer(p_movie_info->epgTitle, p_movie_info->epgInfo1, p_movie_info->epgChannel, position, duration);
if (!FileTime.IsVisible()) { if (!FileTime.IsVisible()) {
if (g_settings.mode_clock) if (g_settings.mode_clock)
@@ -1125,7 +1123,7 @@ void CMoviePlayerGui::PlayFile(void)
playstate = CMoviePlayerGui::FF; playstate = CMoviePlayerGui::FF;
if (!timeshift) if (!timeshift)
callInfoViewer(p_movie_info->epgTitle, p_movie_info->epgInfo1, p_movie_info->epgChannel ); callInfoViewer(p_movie_info->epgTitle, p_movie_info->epgInfo1, p_movie_info->epgChannel, duration, position);
if (!FileTime.IsVisible()) { if (!FileTime.IsVisible()) {
if (g_settings.mode_clock) if (g_settings.mode_clock)
@@ -1140,7 +1138,7 @@ void CMoviePlayerGui::PlayFile(void)
g_InfoViewer->showTitle(CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber(), CNeutrinoApp::getInstance()->channelList->getActiveChannelName(), CNeutrinoApp::getInstance()->channelList->getActiveSatellitePosition(), CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID()); // UTF-8 g_InfoViewer->showTitle(CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber(), CNeutrinoApp::getInstance()->channelList->getActiveChannelName(), CNeutrinoApp::getInstance()->channelList->getActiveSatellitePosition(), CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID()); // UTF-8
else { else {
callInfoViewer(p_movie_info->epgTitle, p_movie_info->epgInfo1, p_movie_info->epgChannel ); callInfoViewer(p_movie_info->epgTitle, p_movie_info->epgInfo1, p_movie_info->epgChannel, duration, position);
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8); CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8);
update_lcd = true; update_lcd = true;
//showHelpTS(); //showHelpTS();
@@ -1268,10 +1266,10 @@ printf("CMoviePlayerGui::PlayFile: exit, isMovieBrowser %d p_movie_info %x\n", i
if (g_settings.mode_clock) if (g_settings.mode_clock)
InfoClock->StartClock(); InfoClock->StartClock();
} }
void CMoviePlayerGui::callInfoViewer(const std::string & epg_title, const std::string & epg_info1, const std::string & epg_channel ) void CMoviePlayerGui::callInfoViewer(const std::string & epg_title, const std::string & epg_info1, const std::string & epg_channel, const int duration, const int curr_pos)
{ {
if (isMovieBrowser) { if (isMovieBrowser) {
g_InfoViewer->showMovieTitle(playstate, epg_channel.c_str(), epg_title, epg_info1); g_InfoViewer->showMovieTitle(playstate, epg_channel.c_str(), epg_title, epg_info1, duration, curr_pos);
} else { } else {
char temp_name[255]; char temp_name[255];
const char *slash = strrchr(filename, '/'); const char *slash = strrchr(filename, '/');
@@ -1287,7 +1285,7 @@ void CMoviePlayerGui::callInfoViewer(const std::string & epg_title, const std::s
temp_name[len] = 0; temp_name[len] = 0;
} }
// g_InfoViewer->showTitle(0, temp_name, 0, 0); // UTF-8 // g_InfoViewer->showTitle(0, temp_name, 0, 0); // UTF-8
g_InfoViewer->showMovieTitle(playstate, temp_name, "", ""); // UTF-8 g_InfoViewer->showMovieTitle(playstate, temp_name, "", "", duration, curr_pos);
} }
} }
void CMoviePlayerGui::showHelpTS() void CMoviePlayerGui::showHelpTS()

3
src/gui/movieplayer.h
View File

@@ -109,7 +109,8 @@ class CMoviePlayerGui : public CMenuTarget
CFileFilter vlcfilefilter; CFileFilter vlcfilefilter;
void showHelpTS(void); void showHelpTS(void);
void showHelpVLC(void); void showHelpVLC(void);
void callInfoViewer(const std::string & epg_title, const std::string & epg_info1, const std::string & epg_channel ); void callInfoViewer(const std::string & epg_title, const std::string & epg_info1,
const std::string & epg_channel, const int duration, const int pos);
public: public:
CMoviePlayerGui(); CMoviePlayerGui();
~CMoviePlayerGui(); ~CMoviePlayerGui();