options: move various mplayer.c options to option struct

Following options were moved: [no]quiet, [no]autosync, softsleep,
[no]rtc, rtc-device.

5 files changed, 22 insertions, 28 deletions

diff --git a/cfg-common.h b/cfg-common.h
index 03218a3c58..02c610d0a7 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -366,8 +366,7 @@ extern const m_option_t xvid_dec_opts[];
 
 const m_option_t common_opts[] = {
 // ------------------------- common options --------------------
-    {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
-    {"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
+    OPT_MAKE_FLAGS("quiet", quiet, CONF_GLOBAL),
     {"really-quiet", &verbose, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_PRE_PARSE, 0, -10, NULL},
     {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL},
         {"msglevel", (void *) msgl_config, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 21733912d5..d00aa379f4 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -310,14 +310,13 @@ const m_option_t mplayer_opts[]={
     OPT_MAKE_FLAGS("correct-pts", user_correct_pts, 0),
     OPT_INTRANGE("pts-association-mode", user_pts_assoc_mode, 0, 0, 2),
     OPT_MAKE_FLAGS("initial-audio-sync", initial_audio_sync, 0),
-    {"noautosync", &autosync, CONF_TYPE_FLAG, 0, 0, -1, NULL},
-    {"autosync", &autosync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL},
+    OPT_FLAG_CONSTANTS("noautosync", autosync, 0, 0, -1),
+    OPT_INTRANGE("autosync", autosync, 0, 0, 10000),
 
-    {"softsleep", &softsleep, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+    OPT_FLAG_ON("softsleep", softsleep, 0),
 #ifdef HAVE_RTC
-    {"nortc", &nortc, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-    {"rtc", &nortc, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-    {"rtc-device", &rtc_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
+    OPT_MAKE_FLAGS("rtc", rtc, 0),
+    OPT_STRING("rtc-device", rtc_device, 0),
 #endif
 
     {"term-osd", &term_osd, CONF_TYPE_FLAG, 0, 0, 1, NULL},
diff --git a/mplayer.c b/mplayer.c
index 77350cad73..840b0950f2 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -101,7 +101,6 @@
 const int under_mencoder = 0;
 int slave_mode=0;
 int player_idle_mode=0;
-int quiet=0;
 int enable_mouse_movements=0;
 float start_volume = -1;
 
@@ -296,9 +295,6 @@ static off_t step_sec=0;
 
 static m_time_size_t end_at = { .type = END_AT_NONE, .pos = 0 };
 
-// A/V sync:
-       int autosync=0; // 30 might be a good default value.
-
 // codecs:
 char **audio_codec_list=NULL; // override audio codec
 char **video_codec_list=NULL; // override video codec
@@ -325,8 +321,6 @@ static float default_max_pts_correction=-1;//0.01f;
        float audio_delay=0;
 static int ignore_start=0;
 
-static int softsleep=0;
-
        double force_fps=0;
 static int force_srate=0;
        int frame_dropping=0; // option  0=no drop  1= drop vo  2= drop decode
@@ -367,11 +361,6 @@ static char* menu_root = "main";
 #endif
 
 
-#ifdef HAVE_RTC
-static int nortc = 1;
-static char* rtc_device;
-#endif
-
 edl_record_ptr edl_records = NULL; ///< EDL entries memory area
 edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records
 FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode.
@@ -1304,7 +1293,7 @@ static void print_status(struct MPContext *mpctx, double a_pos, bool at_frame)
           mpctx->drop_message_shown = true;
       }
   }
-  if (quiet)
+  if (opts->quiet)
       return;
 
 
@@ -1910,13 +1899,14 @@ static float timing_sleep(struct MPContext *mpctx, float time_frame)
     {
 	// assume kernel HZ=100 for softsleep, works with larger HZ but with
 	// unnecessarily high CPU usage
-	float margin = softsleep ? 0.011 : 0;
+        struct MPOpts *opts = &mpctx->opts;
+        float margin = opts->softsleep ? 0.011 : 0;
 	current_module = "sleep_timer";
 	while (time_frame > margin) {
 	    usec_sleep(1000000 * (time_frame - margin));
             time_frame -= get_relative_time(mpctx);
 	}
-	if (softsleep){
+	if (opts->softsleep){
 	    current_module = "sleep_soft";
 	    if (time_frame < 0)
 		mp_tmsg(MSGT_AVSYNC, MSGL_WARN, "Warning! Softsleep underflow!\n");
@@ -2309,7 +2299,7 @@ static int sleep_until_update(struct MPContext *mpctx, float *time_frame,
 	float delay = mpctx->audio_out->get_delay();
 	mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "delay=%f\n", delay);
 
-	if (autosync) {
+	if (opts->autosync) {
 	    /*
 	     * Adjust this raw delay value by calculating the expected
 	     * delay for this frame and generating a new value which is
@@ -2321,7 +2311,7 @@ static int sleep_until_update(struct MPContext *mpctx, float *time_frame,
 	     */
 	    float predicted = mpctx->delay / opts->playback_speed + *time_frame;
 	    float difference = delay - predicted;
-	    delay = predicted + difference / (float)autosync;
+	    delay = predicted + difference / (float)opts->autosync;
 	}
 
 	*time_frame = delay - mpctx->delay / opts->playback_speed;
@@ -2683,8 +2673,9 @@ void add_step_frame(struct MPContext *mpctx)
 
 static void pause_loop(struct MPContext *mpctx)
 {
+    struct MPOpts *opts = &mpctx->opts;
     mp_cmd_t* cmd;
-    if (!quiet) {
+    if (!opts->quiet) {
         // Small hack to display the pause message on the OSD line.
         // The pause string is: "\n == PAUSE == \r" so we need to
         // take the first and the last char out
@@ -3466,8 +3457,9 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
 #endif
 
 #ifdef HAVE_RTC
-  if(!nortc)
+  if(opts->rtc)
   {
+    char *rtc_device = opts->rtc_device;
     // seteuid(0); /* Can't hurt to try to get root here */
     if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0)
 	mp_tmsg(MSGT_CPLAYER, MSGL_WARN, "Failed to open %s: %s (it should be readable by the user.)\n",
@@ -3492,7 +3484,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
     if(rtc_fd<0)
 #endif /* HAVE_RTC */
       mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n",
-	     softsleep?"software":timer_name);
+             opts->softsleep ? "software" : timer_name);
 
 #ifdef HAVE_TERMCAP
   load_termcap(NULL); // load key-codes
diff --git a/mplayer.h b/mplayer.h
index e8e48f715a..7a8eec34e8 100644
--- a/mplayer.h
+++ b/mplayer.h
@@ -42,7 +42,6 @@ extern float  sub_fps;
 extern int    sub_auto;
 
 extern int stream_cache_size;
-extern int autosync;
 
 extern int frame_dropping;
 
diff --git a/options.h b/options.h
index 86d524f57f..7517f3a172 100644
--- a/options.h
+++ b/options.h
@@ -35,6 +35,7 @@ typedef struct MPOpts {
     int capture_dump;
     int loop_times;
     int ordered_chapters;
+    int quiet;
     float stream_cache_min_percent;
     float stream_cache_seek_min_percent;
     int chapterrange[2];
@@ -43,6 +44,10 @@ typedef struct MPOpts {
     int user_correct_pts;
     int user_pts_assoc_mode;
     int initial_audio_sync;
+    int autosync;
+    int softsleep;
+    int rtc;
+    char *rtc_device;
     int key_fifo_size;
     int doubleclick_time;
     int audio_id;