[vlc-devel] [PATCH 5/7] input: move control enum definition up

[Thomas Guillem]

Will be needed by next commit.
---
 src/input/input_internal.h | 130 ++++++++++++++++++-------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 83f3a9e899b..c9596d2da75 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -49,6 +49,71 @@ typedef struct input_thread_t
     struct vlc_object_t obj;
 } input_thread_t;
 
+/***************************************************************************
+ * Internal control helpers
+ ***************************************************************************/
+enum input_control_e
+{
+    INPUT_CONTROL_SET_STATE,
+
+    INPUT_CONTROL_SET_RATE,
+
+    INPUT_CONTROL_SET_POSITION,
+    INPUT_CONTROL_JUMP_POSITION,
+
+    INPUT_CONTROL_SET_TIME,
+    INPUT_CONTROL_JUMP_TIME,
+
+    INPUT_CONTROL_SET_PROGRAM,
+
+    INPUT_CONTROL_SET_TITLE,
+    INPUT_CONTROL_SET_TITLE_NEXT,
+    INPUT_CONTROL_SET_TITLE_PREV,
+
+    INPUT_CONTROL_SET_SEEKPOINT,
+    INPUT_CONTROL_SET_SEEKPOINT_NEXT,
+    INPUT_CONTROL_SET_SEEKPOINT_PREV,
+
+    INPUT_CONTROL_SET_BOOKMARK,
+
+    INPUT_CONTROL_NAV_ACTIVATE, // NOTE: INPUT_CONTROL_NAV_* values must be
+    INPUT_CONTROL_NAV_UP,       // contiguous and in the same order as
+    INPUT_CONTROL_NAV_DOWN,     // INPUT_NAV_* and DEMUX_NAV_*.
+    INPUT_CONTROL_NAV_LEFT,
+    INPUT_CONTROL_NAV_RIGHT,
+    INPUT_CONTROL_NAV_POPUP,
+    INPUT_CONTROL_NAV_MENU,
+
+    INPUT_CONTROL_SET_ES_BY_ID,
+    INPUT_CONTROL_RESTART_ES_BY_ID,
+
+    INPUT_CONTROL_SET_ES,
+    INPUT_CONTROL_SET_ES_LIST,  // select a list of ES atomically
+    INPUT_CONTROL_UNSET_ES,
+    INPUT_CONTROL_RESTART_ES,
+
+    INPUT_CONTROL_SET_VIEWPOINT,    // new absolute viewpoint
+    INPUT_CONTROL_SET_INITIAL_VIEWPOINT, // set initial viewpoint (generally from video)
+    INPUT_CONTROL_UPDATE_VIEWPOINT, // update viewpoint relative to current
+
+    INPUT_CONTROL_SET_CATEGORY_DELAY,
+    INPUT_CONTROL_SET_ES_DELAY,
+
+    INPUT_CONTROL_ADD_SLAVE,
+    INPUT_CONTROL_SET_SUBS_FPS,
+
+    INPUT_CONTROL_SET_RECORD_STATE,
+
+    INPUT_CONTROL_SET_FRAME_NEXT,
+
+    INPUT_CONTROL_SET_RENDERER,
+
+    INPUT_CONTROL_SET_VBI_PAGE,
+    INPUT_CONTROL_SET_VBI_TRANSPARENCY,
+
+    INPUT_CONTROL_SET_ES_AUTOSELECT,
+};
+
 /*****************************************************************************
  * Input events and variables
  *****************************************************************************/
@@ -532,71 +597,6 @@ static inline input_thread_private_t *input_priv(input_thread_t *input)
     return container_of(input, input_thread_private_t, input);
 }
 
-/***************************************************************************
- * Internal control helpers
- ***************************************************************************/
-enum input_control_e
-{
-    INPUT_CONTROL_SET_STATE,
-
-    INPUT_CONTROL_SET_RATE,
-
-    INPUT_CONTROL_SET_POSITION,
-    INPUT_CONTROL_JUMP_POSITION,
-
-    INPUT_CONTROL_SET_TIME,
-    INPUT_CONTROL_JUMP_TIME,
-
-    INPUT_CONTROL_SET_PROGRAM,
-
-    INPUT_CONTROL_SET_TITLE,
-    INPUT_CONTROL_SET_TITLE_NEXT,
-    INPUT_CONTROL_SET_TITLE_PREV,
-
-    INPUT_CONTROL_SET_SEEKPOINT,
-    INPUT_CONTROL_SET_SEEKPOINT_NEXT,
-    INPUT_CONTROL_SET_SEEKPOINT_PREV,
-
-    INPUT_CONTROL_SET_BOOKMARK,
-
-    INPUT_CONTROL_NAV_ACTIVATE, // NOTE: INPUT_CONTROL_NAV_* values must be
-    INPUT_CONTROL_NAV_UP,       // contiguous and in the same order as
-    INPUT_CONTROL_NAV_DOWN,     // INPUT_NAV_* and DEMUX_NAV_*.
-    INPUT_CONTROL_NAV_LEFT,
-    INPUT_CONTROL_NAV_RIGHT,
-    INPUT_CONTROL_NAV_POPUP,
-    INPUT_CONTROL_NAV_MENU,
-
-    INPUT_CONTROL_SET_ES_BY_ID,
-    INPUT_CONTROL_RESTART_ES_BY_ID,
-
-    INPUT_CONTROL_SET_ES,
-    INPUT_CONTROL_SET_ES_LIST,  // select a list of ES atomically
-    INPUT_CONTROL_UNSET_ES,
-    INPUT_CONTROL_RESTART_ES,
-
-    INPUT_CONTROL_SET_VIEWPOINT,    // new absolute viewpoint
-    INPUT_CONTROL_SET_INITIAL_VIEWPOINT, // set initial viewpoint (generally from video)
-    INPUT_CONTROL_UPDATE_VIEWPOINT, // update viewpoint relative to current
-
-    INPUT_CONTROL_SET_CATEGORY_DELAY,
-    INPUT_CONTROL_SET_ES_DELAY,
-
-    INPUT_CONTROL_ADD_SLAVE,
-    INPUT_CONTROL_SET_SUBS_FPS,
-
-    INPUT_CONTROL_SET_RECORD_STATE,
-
-    INPUT_CONTROL_SET_FRAME_NEXT,
-
-    INPUT_CONTROL_SET_RENDERER,
-
-    INPUT_CONTROL_SET_VBI_PAGE,
-    INPUT_CONTROL_SET_VBI_TRANSPARENCY,
-
-    INPUT_CONTROL_SET_ES_AUTOSELECT,
-};
-
 /* Internal helpers */
 
 int input_ControlPush( input_thread_t *, int, const input_control_param_t * );
-- 
2.20.1