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

- strip g_settings.recording_type from unused stuff

Browse Source 
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>
This commit is contained in:
svenhoefer
2021-04-27 22:17:42 +02:00
committed by Thilo Graf
parent 1343c26d5e
commit 74ee83bd4f
12 changed files with 49 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/locals.h
View File

@@ -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,

11
src/system/locals_intern.h
View File

@@ -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",

5
src/system/settings.h
View File

@@ -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;