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

*neutrino record: moved some code lines for stop record calls from neutrino.cpp into record.cpp

Browse Source 
-use only the exec() call with action key "Stop_record" from record.cpp
-small popup message with short timeout added. This will be show if user has pressed stop button, but no recording is running

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1808 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-11-01 23:42:23 +00:00
parent 8eb07a092b
commit c7d7c18a52
6 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -1142,6 +1142,7 @@ recordingmenu.no_scart Unterdrücke Scart-Umschaltung
recordingmenu.off aus
recordingmenu.record_in_spts_mode in SPTS-Modus aufnehmen
recordingmenu.record_is_running Aufnahme läuft!
recordingmenu.record_is_not_running Keine laufende Aufnahme verfügbar!
recordingmenu.recording_type Aufnahme Gerät
recordingmenu.ringbuffers Anz. Ringpuffer
recordingmenu.save_in_channeldir Speichere im Kanalverzeichnis

1
data/locale/english.locale
View File

@@ -1142,6 +1142,7 @@ recordingmenu.no_scart do not switch to scart mode
recordingmenu.off off
recordingmenu.record_in_spts_mode switch to spts mode before recording
recordingmenu.record_is_running Record is running!
recordingmenu.record_is_not_running No record is running!
recordingmenu.recording_type recording device
recordingmenu.ringbuffers no. of ringbuffers
recordingmenu.save_in_channeldir Save in channel dir

7
src/driver/record.cpp
View File

@@ -1229,7 +1229,14 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey )
{
StartTimeshift();
return menu_return::RETURN_EXIT_ALL;
}else if(actionKey == "Stop_record")
{
if(!CRecordManager::getInstance()->RecordingStatus()) {
ShowHintUTF(LOCALE_MAINMENU_RECORDING_STOP, g_Locale->getText(LOCALE_RECORDINGMENU_RECORD_IS_NOT_RUNNING), 450, 2);
return menu_return::RETURN_EXIT_ALL;
}
}
ShowMenu();
return menu_return::RETURN_REPAINT;

4
src/neutrino.cpp
View File

@@ -2344,10 +2344,8 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
CRecordManager::getInstance()->exec(NULL, "Record");
}
else if( msg == CRCInput::RC_stop ) {
if(CRecordManager::getInstance()->RecordingStatus())
CRecordManager::getInstance()->ShowMenu();
CRecordManager::getInstance()->exec(NULL, "Stop_record");
}
else if( msg == CRCInput::RC_red ) {
StopSubtitles();
usermenu.showUserMenu(SNeutrinoSettings::BUTTON_RED);

1
src/system/locals.h
View File

@@ -1169,6 +1169,7 @@ typedef enum
LOCALE_RECORDINGMENU_OFF,
LOCALE_RECORDINGMENU_RECORD_IN_SPTS_MODE,
LOCALE_RECORDINGMENU_RECORD_IS_RUNNING,
LOCALE_RECORDINGMENU_RECORD_IS_NOT_RUNNING,
LOCALE_RECORDINGMENU_RECORDING_TYPE,
LOCALE_RECORDINGMENU_RINGBUFFERS,
LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR,

1
src/system/locals_intern.h
View File

@@ -1169,6 +1169,7 @@ const char * locale_real_names[] =
"recordingmenu.off",
"recordingmenu.record_in_spts_mode",
"recordingmenu.record_is_running",
"recordingmenu.record_is_not_running",
"recordingmenu.recording_type",
"recordingmenu.ringbuffers",
"recordingmenu.save_in_channeldir",