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

Infobar blocked buttons in time shift.

Browse Source 
- When pressing the player buttons (play, pause, etc.)
  in the infobar is now hidden and runs the appropriate commands.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1778 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
micha-bbg
2011-10-26 19:51:06 +00:00
parent 5d9683c313
commit 027b5a06a1
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/infoviewer.cpp
View File

@@ -944,6 +944,18 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn)
} }
else else
res = CNeutrinoApp::getInstance()->handleMsg(msg, data); res = CNeutrinoApp::getInstance()->handleMsg(msg, data);
} else if (CMoviePlayerGui::getInstance().start_timeshift && (msg == NeutrinoMessages::EVT_TIMER)) {
CMoviePlayerGui::getInstance().start_timeshift = false;
} else if (CMoviePlayerGui::getInstance().timeshift && ((msg == (neutrino_msg_t) g_settings.mpkey_rewind) || \
(msg == (neutrino_msg_t) g_settings.mpkey_forward) || \
(msg == (neutrino_msg_t) g_settings.mpkey_pause) || \
(msg == (neutrino_msg_t) g_settings.mpkey_stop) || \
(msg == (neutrino_msg_t) g_settings.mpkey_play) || \
(msg == (neutrino_msg_t) g_settings.mpkey_time) || \
(msg == (neutrino_msg_t) g_settings.key_timeshift))) {
g_RCInput->postMsg (msg, data);
res = messages_return::cancel_info;
} }
} }

2
src/gui/movieplayer.cpp
View File

@@ -214,6 +214,7 @@ void CMoviePlayerGui::Init(void)
jumpseconds = 0; jumpseconds = 0;
showaudioselectdialog = false; showaudioselectdialog = false;
timeshift = 0; timeshift = 0;
start_timeshift = false;
} }
CMoviePlayerGui::~CMoviePlayerGui() CMoviePlayerGui::~CMoviePlayerGui()
@@ -552,6 +553,7 @@ void CMoviePlayerGui::PlayFile(void)
open_filebrowser = false; open_filebrowser = false;
isBookmark = false; isBookmark = false;
timesh = false; timesh = false;
start_timeshift = true;
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
g_InfoViewer->showTitle(CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber(), g_InfoViewer->showTitle(CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber(),
CNeutrinoApp::getInstance()->channelList->getActiveChannelName(), CNeutrinoApp::getInstance()->channelList->getActiveChannelName(),

1
src/gui/movieplayer.h
View File

@@ -138,6 +138,7 @@ class CMoviePlayerGui : public CMenuTarget
void updateLcd(const std::string & sel_filename); void updateLcd(const std::string & sel_filename);
bool Playing(); bool Playing();
int timeshift; int timeshift;
bool start_timeshift;
int file_prozent; int file_prozent;
}; };