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

fix detection of timeshifted channel

Browse Source 
- trigger recording menu on first press of STOP button
- disable recording stop via REC button
- disable menu entry "record current channel" when current channel is already recorded
- disable menu entry "timeshift" when current channel is already recorded or timeshifted
- flag timeshifted channel with prefix "[TS]"

Big thanks to micha-bbg!

For reference: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p133623-anzeige-f%C3%BCr-laufende-aufnahmen/#post133623

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1638 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: a645062f6d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-08-30 (Tue, 30 Aug 2011)

Origin message was:
------------------
- fix detection of timeshifted channel
- trigger recording menu on first press of STOP button
- disable recording stop via REC button
- disable menu entry "record current channel" when current channel is already recorded
- disable menu entry "timeshift" when current channel is already recorded or timeshifted
- flag timeshifted channel with prefix "[TS]"

Big thanks to micha-bbg!

For reference: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p133623-anzeige-f%C3%BCr-laufende-aufnahmen/#post133623

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1638 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2011-08-30 18:00:37 +00:00
parent 1a96b6b4b0
commit 38378ea206
4 changed files with 109 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/neutrino.cpp
View File

@@ -2304,21 +2304,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
g_PluginList->start_plugin_by_name(g_settings.onekey_plugin.c_str(), 0);
}
else if(msg == (neutrino_msg_t) g_settings.key_timeshift) {
if(g_RemoteControl->is_video_started) {
std::string tmode;
bool res = true;
if(CRecordManager::getInstance()->RecordingStatus(live_channel_id)) {
tmode = "ptimeshift"; // already recording, pause
} else {
if(g_settings.temp_timeshift)
res = CRecordManager::getInstance()->StartAutoRecord();
else
res = CRecordManager::getInstance()->Record(live_channel_id);
tmode = "timeshift"; // record just started
}
if(res)
CMoviePlayerGui::getInstance().exec(NULL, tmode);
}
CRecordManager::getInstance()->StartTimeshift();
}
else if(msg == CRCInput::RC_rewind) {
if(g_RemoteControl->is_video_started) {
@@ -2328,9 +2314,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
}
else if( msg == CRCInput::RC_record /* || msg == CRCInput::RC_stop*/ ) {
printf("[neutrino] direct record\n");
if(CRecordManager::getInstance()->RecordingStatus(live_channel_id)) {
CRecordManager::getInstance()->AskToStop(live_channel_id);
} else {
if(!CRecordManager::getInstance()->RecordingStatus(live_channel_id)) {
#if 0 // uncomment, if ChooseRecDir and g_settings.recording_choose_direct_rec_dir ever used to select recording dir
CRecordManager::getInstance()->recordingstatus = 1;
CRecordManager::getInstance()->doGuiRecord();