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

-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


Origin commit data
------------------
Branch: ni/coolstream
Commit: c7d7c18a52
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-11-02 (Wed, 02 Nov 2011)

Origin message was:
------------------
*neutrino record: moved some code lines for stop record calls from neutrino.cpp into record.cpp

-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 was generated by Migit
This commit is contained in:
2011-11-01 23:42:23 +00:00
parent 4ae9ce9dbd
commit 2cebb3c066
6 changed files with 12 additions and 3 deletions

View File

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

View File

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

View File

@@ -1229,7 +1229,14 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey )
{ {
StartTimeshift(); StartTimeshift();
return menu_return::RETURN_EXIT_ALL; 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(); ShowMenu();
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;

View File

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

View File

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

View File

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