[vlc-devel] [PATCH 16/17] core: rename clock source option

Thomas Guillem thomas at gllm.fr
Mon Feb 15 10:15:11 UTC 2021


--clock-master=1 is now driven by the input PCR.
---
 src/clock/clock.h   | 2 +-
 src/input/es_out.c  | 2 +-
 src/libvlc-module.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/clock/clock.h b/src/clock/clock.h
index c1d675c7d23..2e5696ae8fd 100644
--- a/src/clock/clock.h
+++ b/src/clock/clock.h
@@ -23,7 +23,7 @@
 enum vlc_clock_master_source
 {
     VLC_CLOCK_MASTER_AUDIO = 0,
-    VLC_CLOCK_MASTER_MONOTONIC,
+    VLC_CLOCK_MASTER_INPUT,
     VLC_CLOCK_MASTER_DEFAULT = VLC_CLOCK_MASTER_AUDIO,
 };
 
diff --git a/src/input/es_out.c b/src/input/es_out.c
index 259a4a52a11..c90c935ce08 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -523,7 +523,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input, input_source_t *main_source,
         case VLC_CLOCK_MASTER_AUDIO:
             p_sys->i_master_source_cat = AUDIO_ES;
             break;
-        case VLC_CLOCK_MASTER_MONOTONIC:
+        case VLC_CLOCK_MASTER_INPUT:
         default:
             p_sys->i_master_source_cat = UNKNOWN_ES;
             break;
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 16d96d53b5c..2af7fd3de74 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -540,11 +540,11 @@ static const char *const screensaver_texts[] = {
 
 static const int pi_clock_master_values[] = {
     VLC_CLOCK_MASTER_AUDIO,
-    VLC_CLOCK_MASTER_MONOTONIC,
+    VLC_CLOCK_MASTER_INPUT,
 };
 static const char *const ppsz_clock_master_descriptions[] = {
     N_("Audio"),
-    N_("Monotonic")
+    N_("Input")
 };
 
 static const int pi_clock_values[] = { -1, 0, 1 };
-- 
2.30.0



More information about the vlc-devel mailing list