From e033f3c8bcf66de44b0cc25e543a85f19fc9f964 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 9 Jun 2014 23:38:28 +0200
Subject: command: redo ancient TV/DVB/PVR commands

Convert all these commands to properties. (Except tv_last_channel, not
sure what to do with this.) Also, internally, don't access stream
details directly, but dispatch commands with stream ctrls.

Many of the new properties are a bit strange, because they're write-
only. Also remove some OSD output these commands produced, because I
couldn't be bothered to port these.

In general, this makes everything much cleaner, and will also make it
easier to e.g. move the demuxer to its own thread.

Don't bother updating input.conf, but changes.rst documents how old
commands map to the new ones.

Mostly untested, due to lack of hardware.
---
 input/cmd_list.c | 10 ----------
 input/cmd_list.h | 11 -----------
 2 files changed, 21 deletions(-)

(limited to 'input')

diff --git a/input/cmd_list.c b/input/cmd_list.c
index 24ef6e7a0e..1096e83d63 100644
--- a/input/cmd_list.c
+++ b/input/cmd_list.c
@@ -93,17 +93,7 @@ const struct mp_cmd_def mp_cmds[] = {
   { MP_CMD_SUB_REMOVE, "sub_remove", { OARG_INT(-1) } },
   { MP_CMD_SUB_RELOAD, "sub_reload", { OARG_INT(-1) } },
 
-  { MP_CMD_TV_START_SCAN, "tv_start_scan", },
-  { MP_CMD_TV_STEP_CHANNEL, "tv_step_channel", { ARG_INT } },
-  { MP_CMD_TV_STEP_NORM, "tv_step_norm", },
-  { MP_CMD_TV_STEP_CHANNEL_LIST, "tv_step_chanlist", },
-  { MP_CMD_TV_SET_CHANNEL, "tv_set_channel", { ARG_STRING } },
   { MP_CMD_TV_LAST_CHANNEL, "tv_last_channel", },
-  { MP_CMD_TV_SET_FREQ, "tv_set_freq", { ARG_FLOAT } },
-  { MP_CMD_TV_STEP_FREQ, "tv_step_freq", { ARG_FLOAT } },
-  { MP_CMD_TV_SET_NORM, "tv_set_norm", { ARG_STRING } },
-
-  { MP_CMD_DVB_SET_CHANNEL, "dvb_set_channel", { ARG_INT, ARG_INT } },
 
   { MP_CMD_SCREENSHOT, "screenshot", {
       OARG_CHOICE(2, ({"video", 0},
diff --git a/input/cmd_list.h b/input/cmd_list.h
index f061814f23..ada1932f8d 100644
--- a/input/cmd_list.h
+++ b/input/cmd_list.h
@@ -46,9 +46,6 @@ enum mp_command_type {
     MP_CMD_PLAYLIST_NEXT,
     MP_CMD_PLAYLIST_PREV,
     MP_CMD_OSD,
-    MP_CMD_TV_STEP_CHANNEL,
-    MP_CMD_TV_STEP_NORM,
-    MP_CMD_TV_STEP_CHANNEL_LIST,
     MP_CMD_SCREENSHOT,
     MP_CMD_SCREENSHOT_TO_FILE,
     MP_CMD_LOADFILE,
@@ -58,10 +55,7 @@ enum mp_command_type {
     MP_CMD_PLAYLIST_MOVE,
     MP_CMD_SUB_STEP,
     MP_CMD_SUB_SEEK,
-    MP_CMD_TV_SET_CHANNEL,
     MP_CMD_TV_LAST_CHANNEL,
-    MP_CMD_TV_SET_FREQ,
-    MP_CMD_TV_SET_NORM,
     MP_CMD_FRAME_STEP,
     MP_CMD_FRAME_BACK_STEP,
     MP_CMD_RUN,
@@ -77,8 +71,6 @@ enum mp_command_type {
     MP_CMD_CYCLE,
     MP_CMD_MULTIPLY,
     MP_CMD_CYCLE_VALUES,
-    MP_CMD_TV_STEP_FREQ,
-    MP_CMD_TV_START_SCAN,
     MP_CMD_STOP,
 
     MP_CMD_ENABLE_INPUT_SECTION,
@@ -86,9 +78,6 @@ enum mp_command_type {
 
     MP_CMD_DISCNAV,
 
-    /// DVB commands
-    MP_CMD_DVB_SET_CHANNEL,
-
     /// Audio Filter commands
     MP_CMD_AF,
 
-- 
cgit v1.2.3