- strip g_settings.recording_type from unused stuff

Conflicts: data/locale/deutsch.locale data/locale/english.locale data/locale/slovak.locale src/system/locals.h src/system/locals_intern.h Signed-off-by: Thilo Graf <dbt@novatux.de>
2025-08-27 23:42:58 +02:00 · 2021-04-27 22:17:42 +02:00
parent 1343c26d5e
commit 74ee83bd4f
12 changed files with 49 additions and 70 deletions
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -2222,6 +2222,8 @@ nfs.automount Beim Start mounten
 nfs.dir Verzeichnis/Freigabe
 nfs.ip Server IP
 nfs.localdir lokales Verzeichnis
+nfs.mac MAC-Adresse
+nfs.mac_refresh MAC-Adresse feststellen
 nfs.mount Netzwerk Verzeichnis mounten
 nfs.mount_options Mount-Optionen
 nfs.mounterror Mount-Fehler
@@ -2230,7 +2232,6 @@ nfs.mountnow Jetzt mounten
 nfs.mountok Mount erfolgreich
 nfs.mounttimeout Mount-Fehler: Timeout
 nfs.password Passwort
-nfs.refresh_mac MAC-Adresse feststellen
 nfs.remount Verzeichnisse erneut mounten
 nfs.type Typ
 nfs.type_cifs CIFS
@@ -2414,7 +2415,6 @@ recordingmenu.dvbsub_pids Untertitel aufnehmen
 recordingmenu.end_of_recording_epg EPG aktuelles Event
 recordingmenu.end_of_recording_max max. Aufnahmezeit
 recordingmenu.end_of_recording_name Ende der Sofortaufnahme
-recordingmenu.file Direkt (Datei)
 recordingmenu.filename_template Vorlage für Dateiname
 recordingmenu.filename_template_hint Platzhalter werden durch folgende Werte ersetzt:
 recordingmenu.filename_template_hint2 %C = Kanal, %T = Titel, %I = Info, %d = Datum, %t = Zeit
@@ -2423,20 +2423,19 @@ recordingmenu.multimenu.ask_stop_all Wirklich alle %d Aufnahmen beenden?
 recordingmenu.multimenu.info_stop_all %d von %d Aufnahmen werden beendet.
 recordingmenu.multimenu.rec_akt Aufnahme aktueller Kanal
 recordingmenu.multimenu.stop_all Alle Aufnahmen beenden
-recordingmenu.multimenu.timeshift Timeshift
-recordingmenu.off aus
+recordingmenu.multimenu.timeshift Starte Timeshift
+recordingmenu.multimenu.timeshift2record Behalte Timeshift-Aufnahme nach Beendigung
 recordingmenu.record_is_not_running Keine laufende Aufnahme verfügbar!
 recordingmenu.record_is_running Aufnahme läuft!
 recordingmenu.save_in_channeldir Speichere im Kanalverzeichnis
-recordingmenu.server Server
-recordingmenu.server_mac MAC-Adresse
 recordingmenu.setupnow Einstellungen jetzt übernehmen
 recordingmenu.slow_warn Warnung bei langsamen Aufnahmemedien
 recordingmenu.timeshift Timeshift
 recordingmenu.tsdir Timeshift Aufnahmeverzeichnis
-recordingmenu.vcr Videorekorder
 recordingmenu.vtxt_pid Videotext aufnehmen
 recordingmenu.zap_on_announce Umschalten bei Ankündigung
+recording_type.file Direkt (Datei)
+recording_type.off aus
 recordtimer.announce Die Aufnahme beginnt in wenigen Minuten.
 remotebox_add Hinzufügen
 remotebox_channel_na Kanal auf Remote-Box nicht verfügbar
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -2222,6 +2222,8 @@ nfs.automount Mount on startup
 nfs.dir directory/share
 nfs.ip Server IP
 nfs.localdir local dir
+nfs.mac MAC address
+nfs.mac_refresh look up MAC address
 nfs.mount Mount Network volume
 nfs.mount_options mount options
 nfs.mounterror mount error
@@ -2230,7 +2232,6 @@ nfs.mountnow mount now
 nfs.mountok mount successful
 nfs.mounttimeout mount error: timeout
 nfs.password password
-nfs.refresh_mac look up MAC address
 nfs.remount remount directories
 nfs.type type
 nfs.type_cifs CIFS
@@ -2414,29 +2415,27 @@ recordingmenu.dvbsub_pids record dvbsub stream
 recordingmenu.end_of_recording_epg EPG act. Event
 recordingmenu.end_of_recording_max max. Recordingtime
 recordingmenu.end_of_recording_name Endtime of Recording
-recordingmenu.file direct (file)
 recordingmenu.filename_template filename template
 recordingmenu.filename_template_hint wildcards will be replaced
 recordingmenu.filename_template_hint2 %C = channel, %T = title, %I = info, %d = date, %t = time
 recordingmenu.help Recording devices:\n--------------------------\nserver:\nusing streaming software on a PC\n\n(analog) vcr:\nusing the vcr outlet\n\ndirect (file):\ndirectly into an NFS mounted directory\nor onto an internal hard drive\nTS: use spts mode(dbox2)\nPES: do not use spts mode(dbox2)\n\n\nMax. file size:\n---------------------\nNFS V2: 2 GB (2048 MB)\nNFS V3: almost unlimited (0 MB)\nFAT: 2 GB (2048 MB)\nFAT32: 4 GB (4096 MB)
 recordingmenu.multimenu.ask_stop_all really stop all %d recordings?
 recordingmenu.multimenu.info_stop_all %d of %d recordings will be stopped.
-recordingmenu.multimenu.rec_akt record current channel
-recordingmenu.multimenu.stop_all stop all recordings
-recordingmenu.multimenu.timeshift Timeshift
-recordingmenu.off off
+recordingmenu.multimenu.rec_akt Start recording
+recordingmenu.multimenu.stop_all Stop all recordings
+recordingmenu.multimenu.timeshift Start timeshift
+recordingmenu.multimenu.timeshift2record Save timeshift recording after finalization
 recordingmenu.record_is_not_running No record is running!
 recordingmenu.record_is_running Record is running!
 recordingmenu.save_in_channeldir Save in channel dir
-recordingmenu.server server
-recordingmenu.server_mac MAC address
 recordingmenu.setupnow Activate changes
 recordingmenu.slow_warn Enable slow record warning
 recordingmenu.timeshift Timeshift
 recordingmenu.tsdir Timeshift directory
-recordingmenu.vcr vcr
 recordingmenu.vtxt_pid record teletext
 recordingmenu.zap_on_announce zap on recording announce
+recording_type.file Direct (File)
+recording_type.off off
 recordtimer.announce Recording starts in a few minutes
 remotebox_add Add
 remotebox_channel_na Channel not available on Remote-Box
--- a/data/locale/slovak.locale
+++ b/data/locale/slovak.locale
@@ -2163,8 +2163,10 @@ nfs.alreadymounted Zložka je už pripojená
 nfs.automount Pripojiť pri spustení
 nfs.dir Zložka / Zdielanie
 nfs.ip IP servera NFS/CIFS
-nfs.localdir Lokálna zložka
-nfs.mount Pripojiť sieťovú zložku
+nfs.localdir Lokálny priečinok
+nfs.mac MAC adresu
+nfs.mac_refresh vyhľadať MAC adresu
+nfs.mount Pripojiť sieťový priečinok
 nfs.mount_options Možnosti pripojenia
 nfs.mounterror Chyba pripojenia
 nfs.mounterror_notsup Nepodporovaný súborový systém
@@ -2172,7 +2174,6 @@ nfs.mountnow Pripojiť teraz
 nfs.mountok Pripojenie úspešné
 nfs.mounttimeout Chyba pripojenia: uplynul časový limit
 nfs.password Heslo CIFS
-nfs.refresh_mac vyhľadať MAC adresu
 nfs.remount Znovu pripojiť
 nfs.type Typ
 nfs.type_cifs CIFS
@@ -2358,7 +2359,6 @@ recordingmenu.dvbsub_pids Nahrať titulky
 recordingmenu.end_of_recording_epg času udalosti v EPG
 recordingmenu.end_of_recording_max max. času nahrávania
 recordingmenu.end_of_recording_name Ukončiť nahrávanie podľa
-recordingmenu.file Disk (súbor)
 recordingmenu.filename_template Dočasný názov
 recordingmenu.filename_template_hint Zástupné znaky súborov budú nahradené
 recordingmenu.filename_template_hint2 %C = kanál, %T = názov, %I = info, %d = dátum, %t = čas
@@ -2369,19 +2369,18 @@ recordingmenu.multimenu.info_stop_all %d z %d nahrávaní bude zastavených.
 recordingmenu.multimenu.rec_akt Nahrať aktuálny kanál
 recordingmenu.multimenu.stop_all Zastaviť všetky nahrávania
 recordingmenu.multimenu.timeshift Časový posun
-recordingmenu.off vypnuté
+recordingmenu.multimenu.timeshift2record Po dokončení si ponechajte záznam s časovým posunom
 recordingmenu.record_is_not_running Žiadne nahrávanie nebeží!
 recordingmenu.record_is_running Nahrávanie beží!
-recordingmenu.save_in_channeldir Nahrávanie do zložky s názvom kanálu
-recordingmenu.server server
-recordingmenu.server_mac Adresa MAC servera
+recordingmenu.save_in_channeldir Nahrávanie do priečinka s názvom kanálu
 recordingmenu.setupnow Použiť nastavenia
 recordingmenu.slow_warn Upozorniť na pomalé nahrávanie
 recordingmenu.timeshift Časový posun
-recordingmenu.tsdir Zložka časového posunu
-recordingmenu.vcr Videorekordér
+recordingmenu.tsdir Priečinok časového posunu
 recordingmenu.vtxt_pid Nahrať teletext
 recordingmenu.zap_on_announce Prepnúť na kanál pred začatím nahrávania
+recording_type.file Disk (súbor)
+recording_type.off vypnuté
 recordtimer.announce Začatie nahrávania za pár minút.
 remotebox_add pridať
 remotebox_channel_na Kanál nedostupný na vzdialenom boxe
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -1895,7 +1895,7 @@ void CChannelList::paintButtonBar(bool is_current)
 		}
 		if (i == 4) {
 			//manage record button
-			if (g_settings.recording_type == RECORDING_OFF)
+			if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF)
 				continue;
 			if (IS_WEBCHAN(channel_id))
 				continue;
--- a/src/gui/nfs.cpp
+++ b/src/gui/nfs.cpp
@@ -267,10 +267,10 @@ int CNFSMountGui::menuEntry(int nr)
 	CKeyboardInput passInput(LOCALE_NFS_PASSWORD, &g_settings.network_nfs[nr].password);
 	CMenuForwarder *password_fwd = new CMenuForwarder(LOCALE_NFS_PASSWORD, (g_settings.network_nfs[nr].type != (int)CFSMounter::NFS), NULL, &passInput);

-	CMACInput macInput(LOCALE_RECORDINGMENU_SERVER_MAC, &g_settings.network_nfs[nr].mac, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2);
-	CMenuForwarder *macInput_fwd = new CMenuForwarder(LOCALE_RECORDINGMENU_SERVER_MAC, true, NULL, &macInput);
+	CMACInput macInput(LOCALE_NFS_MAC, &g_settings.network_nfs[nr].mac, LOCALE_IPSETUP_HINT_1, LOCALE_IPSETUP_HINT_2);
+	CMenuForwarder *macInput_fwd = new CMenuForwarder(LOCALE_NFS_MAC, true, NULL, &macInput);

-	CMenuForwarder *refreshMAC_fwd = new CMenuForwarder(LOCALE_NFS_REFRESH_MAC, true, NULL, this, ("refreshMAC" + to_string(nr)).c_str(), CRCInput::RC_yellow);
+	CMenuForwarder *refreshMAC_fwd = new CMenuForwarder(LOCALE_NFS_MAC_REFRESH, true, NULL, this, ("refreshMAC" + to_string(nr)).c_str(), CRCInput::RC_yellow);

 	CMenuForwarder *mountnow_fwd = new CMenuForwarder(LOCALE_NFS_MOUNTNOW, !(CFSMounter::isMounted(g_settings.network_nfs[nr].local_dir)), NULL, this, ("domount" + to_string(nr)).c_str(), CRCInput::RC_red);

--- a/src/gui/record_setup.cpp
+++ b/src/gui/record_setup.cpp
@@ -148,22 +148,13 @@ int CRecordSetup::exec(CMenuTarget* parent, const std::string &actionKey)

 	return res;
 }
-#if 0 //not used
-#define RECORDINGMENU_RECORDING_TYPE_OPTION_COUNT 4
+
+#if 0
+#define RECORDINGMENU_RECORDING_TYPE_OPTION_COUNT 2
 const CMenuOptionChooser::keyval RECORDINGMENU_RECORDING_TYPE_OPTIONS[RECORDINGMENU_RECORDING_TYPE_OPTION_COUNT] =
 {
 	{ CNeutrinoApp::RECORDING_OFF , LOCALE_RECORDINGMENU_OFF },
-	{ CNeutrinoApp::RECORDING_SERVER, LOCALE_RECORDINGMENU_SERVER },
-	{ CNeutrinoApp::RECORDING_VCR   , LOCALE_RECORDINGMENU_VCR    },
-	{ CNeutrinoApp::RECORDING_FILE  , LOCALE_RECORDINGMENU_FILE   }
-};
-
-#define CHOOSE_DIRECT_REC_DIR_COUNT 3
-const CMenuOptionChooser::keyval CHOOSE_DIRECT_REC_DIR[RECORDINGMENU_RECORDING_TYPE_OPTION_COUNT] =
-{
-	{0, LOCALE_OPTIONS_OFF},
-	{1, LOCALE_NFS_TYPE_NFS},
-	{2, LOCALE_NFS_LOCALDIR}
+	{ CNeutrinoApp::RECORDING_FILE, LOCALE_RECORDINGMENU_FILE }
 };
 #endif

--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -127,7 +127,7 @@ public:
 				 tmTime2->tm_hour, tmTime2->tm_min);
 			*display = std::string(disp);
 			m1->setActive(true);
-			m6->setActive((g_settings.recording_type == RECORDING_FILE));
+			m6->setActive((g_settings.recording_type == CNeutrinoApp::RECORDING_FILE));
 		}
 		else
 		{
@@ -1673,7 +1673,7 @@ int CTimerList::modifyTimer()
 		timer_recordingDir = timer->recordingDir;
 		strncpy(t_old.recordingDir, timer->recordingDir, sizeof(t_old.recordingDir));

-		bool recDirEnabled = (g_settings.recording_type == RECORDING_FILE); // obsolete?
+		bool recDirEnabled = (g_settings.recording_type == CNeutrinoApp::RECORDING_FILE);
 		CMenuForwarder* m6 = new CMenuForwarder(LOCALE_TIMERLIST_RECORDING_DIR, recDirEnabled, timer_recordingDir, this, "rec_dir1", CRCInput::RC_green);
 		timerSettings.addItem(GenericMenuSeparatorLine);
 		timerSettings.addItem(m6);
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -292,7 +292,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 		}
 		case SNeutrinoSettings::ITEM_RECORD:
 		{
-			if (g_settings.recording_type == RECORDING_OFF)
+			if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF)
 				break;
 			keyhelper.get(&key,&icon,CRCInput::RC_red);
 			menu_item = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_REC_AKT, true, NULL, CRecordManager::getInstance(), "-1", key, icon);
@@ -301,7 +301,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 		}
 		case SNeutrinoSettings::ITEM_TIMESHIFT:
 		{
-			if (g_settings.recording_type == RECORDING_OFF)
+			if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF)
 				break;
 			keyhelper.get(&key,&icon,CRCInput::RC_red);
 			menu_item = new CMenuForwarder(LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT, !timeshift, NULL, CRecordManager::getInstance(), "Timeshift", key, icon);
@@ -310,7 +310,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 		}
 		case SNeutrinoSettings::ITEM_MOVIEPLAYER_MB:
 		{
-			if (g_settings.recording_type == RECORDING_OFF)
+			if (g_settings.recording_type == CNeutrinoApp::RECORDING_OFF)
 				break;
 			keyhelper.get(&key,&icon,CRCInput::RC_green);
 			menu_item = new CMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, !_mode_ts, NULL, neutrino, "tsmoviebrowser", key, icon);
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -68,9 +68,7 @@ public:
 	enum
 	{
 		RECORDING_OFF = 0,
-		RECORDING_SERVER = 1,
-		RECORDING_VCR    = 2,
-		RECORDING_FILE   = 3
+		RECORDING_FILE
 	};

 private:
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -2249,6 +2249,8 @@ typedef enum
 	LOCALE_NFS_DIR,
 	LOCALE_NFS_IP,
 	LOCALE_NFS_LOCALDIR,
+	LOCALE_NFS_MAC,
+	LOCALE_NFS_MAC_REFRESH,
 	LOCALE_NFS_MOUNT,
 	LOCALE_NFS_MOUNT_OPTIONS,
 	LOCALE_NFS_MOUNTERROR,
@@ -2257,7 +2259,6 @@ typedef enum
 	LOCALE_NFS_MOUNTOK,
 	LOCALE_NFS_MOUNTTIMEOUT,
 	LOCALE_NFS_PASSWORD,
-	LOCALE_NFS_REFRESH_MAC,
 	LOCALE_NFS_REMOUNT,
 	LOCALE_NFS_TYPE,
 	LOCALE_NFS_TYPE_CIFS,
@@ -2441,7 +2442,6 @@ typedef enum
 	LOCALE_RECORDINGMENU_END_OF_RECORDING_EPG,
 	LOCALE_RECORDINGMENU_END_OF_RECORDING_MAX,
 	LOCALE_RECORDINGMENU_END_OF_RECORDING_NAME,
-	LOCALE_RECORDINGMENU_FILE,
 	LOCALE_RECORDINGMENU_FILENAME_TEMPLATE,
 	LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT,
 	LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT2,
@@ -2451,19 +2451,18 @@ typedef enum
 	LOCALE_RECORDINGMENU_MULTIMENU_REC_AKT,
 	LOCALE_RECORDINGMENU_MULTIMENU_STOP_ALL,
 	LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT,
-	LOCALE_RECORDINGMENU_OFF,
+	LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT2RECORD,
 	LOCALE_RECORDINGMENU_RECORD_IS_NOT_RUNNING,
 	LOCALE_RECORDINGMENU_RECORD_IS_RUNNING,
 	LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR,
-	LOCALE_RECORDINGMENU_SERVER,
-	LOCALE_RECORDINGMENU_SERVER_MAC,
 	LOCALE_RECORDINGMENU_SETUPNOW,
 	LOCALE_RECORDINGMENU_SLOW_WARN,
 	LOCALE_RECORDINGMENU_TIMESHIFT,
 	LOCALE_RECORDINGMENU_TSDIR,
-	LOCALE_RECORDINGMENU_VCR,
 	LOCALE_RECORDINGMENU_VTXT_PID,
 	LOCALE_RECORDINGMENU_ZAP_ON_ANNOUNCE,
+	LOCALE_RECORDING_TYPE_FILE,
+	LOCALE_RECORDING_TYPE_OFF,
 	LOCALE_RECORDTIMER_ANNOUNCE,
 	LOCALE_REMOTEBOX_ADD,
 	LOCALE_REMOTEBOX_CHANNEL_NA,
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -2249,6 +2249,8 @@ const char * locale_real_names[] =
 	"nfs.dir",
 	"nfs.ip",
 	"nfs.localdir",
+	"nfs.mac",
+	"nfs.mac_refresh",
 	"nfs.mount",
 	"nfs.mount_options",
 	"nfs.mounterror",
@@ -2257,7 +2259,6 @@ const char * locale_real_names[] =
 	"nfs.mountok",
 	"nfs.mounttimeout",
 	"nfs.password",
-	"nfs.refresh_mac",
 	"nfs.remount",
 	"nfs.type",
 	"nfs.type_cifs",
@@ -2441,7 +2442,6 @@ const char * locale_real_names[] =
 	"recordingmenu.end_of_recording_epg",
 	"recordingmenu.end_of_recording_max",
 	"recordingmenu.end_of_recording_name",
-	"recordingmenu.file",
 	"recordingmenu.filename_template",
 	"recordingmenu.filename_template_hint",
 	"recordingmenu.filename_template_hint2",
@@ -2451,19 +2451,18 @@ const char * locale_real_names[] =
 	"recordingmenu.multimenu.rec_akt",
 	"recordingmenu.multimenu.stop_all",
 	"recordingmenu.multimenu.timeshift",
-	"recordingmenu.off",
+	"recordingmenu.multimenu.timeshift2record",
 	"recordingmenu.record_is_not_running",
 	"recordingmenu.record_is_running",
 	"recordingmenu.save_in_channeldir",
-	"recordingmenu.server",
-	"recordingmenu.server_mac",
 	"recordingmenu.setupnow",
 	"recordingmenu.slow_warn",
 	"recordingmenu.timeshift",
 	"recordingmenu.tsdir",
-	"recordingmenu.vcr",
 	"recordingmenu.vtxt_pid",
 	"recordingmenu.zap_on_announce",
+	"recording_type.file",
+	"recording_type.off",
 	"recordtimer.announce",
 	"remotebox_add",
 	"remotebox_channel_na",
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -1234,11 +1234,6 @@ struct SglobalInfo
 	hw_caps_t *hw_caps;
 };

-const int RECORDING_OFF    = 0;
-const int RECORDING_SERVER = 1;
-const int RECORDING_VCR    = 2;
-const int RECORDING_FILE   = 3;
-
 const int PARENTALLOCK_PROMPT_NEVER          = 0;
 const int PARENTALLOCK_PROMPT_ONSTART        = 1;
 const int PARENTALLOCK_PROMPT_CHANGETOLOCKED = 2;