From 49796880fdbb2b29d62a07dbf6f7a978663e5a75 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 20 Jan 2019 23:33:59 +0100 Subject: [PATCH] record: re-sort buffer handling keywords Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a0dd30bc21b5e37daca9b729b48cfc8ca8f64e14 Author: vanhofen Date: 2019-01-20 (Sun, 20 Jan 2019) Origin message was: ------------------ - record: re-sort buffer handling keywords ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/record_setup.cpp | 4 ++++ src/neutrino.cpp | 6 +++--- src/system/settings.h | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp index 34a83fd52..7460d173b 100644 --- a/src/gui/record_setup.cpp +++ b/src/gui/record_setup.cpp @@ -257,11 +257,15 @@ int CRecordSetup::showRecordSetup() #if HAVE_ARM_HARDWARE CMenuOptionNumberChooser *ch; + ch = new CMenuOptionNumberChooser(LOCALE_EXTRA_RECORD_BUFSIZE, &g_settings.recording_bufsize, true, 1, 25, NULL); ch->setNumberFormat("%d MB"); + //TODO: ch->setHint("", LOCALE_MENU_HINT_RECORD_BUFSIZE); recordingSettings->addItem(ch); + ch = new CMenuOptionNumberChooser(LOCALE_EXTRA_RECORD_BUFSIZE_DMX, &g_settings.recording_bufsize_dmx, true, 1, 25, NULL); ch->setNumberFormat("%d MB"); + //TODO: ch->setHint("", LOCALE_MENU_HINT_RECORD_BUFSIZE_DMX); recordingSettings->addItem(ch); #endif diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 9c11a2e97..68accb35d 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1615,13 +1615,13 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setBool ("shutdown_timer_record_type" , g_settings.shutdown_timer_record_type ); configfile.setBool ("recordingmenu.stream_vtxt_pid" , g_settings.recording_stream_vtxt_pid ); + configfile.setBool ("recordingmenu.stream_subtitle_pids" , g_settings.recording_stream_subtitle_pids ); + configfile.setBool ("recordingmenu.stream_pmt_pid" , g_settings.recording_stream_pmt_pid ); + configfile.setString("recordingmenu.filename_template" , g_settings.recording_filename_template ); #if HAVE_ARM_HARDWARE configfile.setInt32 ("recording_bufsize" , g_settings.recording_bufsize); configfile.setInt32 ("recording_bufsize_dmx" , g_settings.recording_bufsize_dmx); #endif - configfile.setBool ("recordingmenu.stream_subtitle_pids" , g_settings.recording_stream_subtitle_pids ); - configfile.setBool ("recordingmenu.stream_pmt_pid" , g_settings.recording_stream_pmt_pid ); - configfile.setString("recordingmenu.filename_template" , g_settings.recording_filename_template ); configfile.setInt32 ("recording_choose_direct_rec_dir" , g_settings.recording_choose_direct_rec_dir); configfile.setBool ("recording_epg_for_filename" , g_settings.recording_epg_for_filename ); configfile.setBool ("recording_epg_for_end" , g_settings.recording_epg_for_end ); diff --git a/src/system/settings.h b/src/system/settings.h index adc25c204..93c925da1 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -505,13 +505,13 @@ struct SNeutrinoSettings int recording_audio_pids_std; int recording_audio_pids_alt; int recording_audio_pids_ac3; + int recording_stream_vtxt_pid; + int recording_stream_subtitle_pids; + int recording_stream_pmt_pid; #if HAVE_ARM_HARDWARE int recording_bufsize; int recording_bufsize_dmx; #endif - int recording_stream_vtxt_pid; - int recording_stream_subtitle_pids; - int recording_stream_pmt_pid; int recording_choose_direct_rec_dir; int recording_epg_for_filename; int recording_epg_for_end;