From a749c614375107a09e5877f6bb654133c7947672 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sat, 15 Sep 2012 02:04:57 +0200
Subject: commands: rename osd_show_[property_]text and osd_show_progression

osd_show_[property_]text => show_text
osd_show_progression => show_progress

show_text, osd_show_property_text and osd_show_text both map to the
code for the previous osd_show_property_text. The only special thing
about osd_show_text is that you don't need to escape "$". Also,
unfortunately osd_show_property_text requires escaping things twice,
one time for the command parser, and the other time for the property
formatting code, while osd_show_text needed only one level of escaping.
---
 input/input.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'input/input.h')

diff --git a/input/input.h b/input/input.h
index aed05af78f..0fa5c32971 100644
--- a/input/input.h
+++ b/input/input.h
@@ -39,7 +39,6 @@ enum mp_command_type {
     MP_CMD_TV_SET_CHANNEL,
     MP_CMD_EDL_MARK,
     MP_CMD_TV_LAST_CHANNEL,
-    MP_CMD_OSD_SHOW_TEXT,
     MP_CMD_TV_SET_FREQ,
     MP_CMD_TV_SET_NORM,
     MP_CMD_SWITCH_RATIO,
@@ -50,8 +49,8 @@ enum mp_command_type {
     MP_CMD_KEYDOWN_EVENTS,
     MP_CMD_SET,
     MP_CMD_GET_PROPERTY,
-    MP_CMD_OSD_SHOW_PROPERTY_TEXT,
-    MP_CMD_OSD_SHOW_PROGRESSION,
+    MP_CMD_SHOW_TEXT,
+    MP_CMD_SHOW_PROGRESS,
     MP_CMD_RADIO_STEP_CHANNEL,
     MP_CMD_RADIO_SET_CHANNEL,
     MP_CMD_RADIO_SET_FREQ,
-- 
cgit v1.2.3