Merge branch 'input_changes' into master

Conflicts:
	DOCS/man/en/vo.rst
	etc/input.conf
	input/input.c
	m_property.c

1 files changed, 2 insertions, 2 deletions

diff --git a/mp_osd.h b/mp_osd.h
index 0e9476a4f8..444b54736c 100644
--- a/mp_osd.h
+++ b/mp_osd.h
@@ -19,7 +19,6 @@
 #ifndef MPLAYER_MP_OSD_H
 #define MPLAYER_MP_OSD_H
 
-#define OSD_MSG_TV_CHANNEL              0
 #define OSD_MSG_TEXT                    1
 #define OSD_MSG_SUB_DELAY               2
 #define OSD_MSG_SPEED                   3
@@ -27,12 +26,14 @@
 #define OSD_MSG_BAR                     5
 #define OSD_MSG_PAUSE                   6
 #define OSD_MSG_RADIO_CHANNEL           7
+#define OSD_MSG_TV_CHANNEL              8
 /// Base id for messages generated from the commmand to property bridge.
 #define OSD_MSG_PROPERTY                0x100
 #define OSD_MSG_SUB_BASE                0x1000
 
 #define MAX_OSD_LEVEL 3
 #define MAX_TERM_OSD_LEVEL 1
+#define OSD_LEVEL_INVISIBLE 4
 
 struct MPContext;
 
@@ -40,6 +41,5 @@ void set_osd_bar(struct MPContext *mpctx, int type,const char* name,double min,d
 void set_osd_msg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...);
 void set_osd_tmsg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...);
 void rm_osd_msg(struct MPContext *mpctx, int id);
-void mp_show_osd_progression(struct MPContext *mpctx);
 
 #endif /* MPLAYER_MP_OSD_H */