[vlc-commits] input: remove unused INPUT_SET_NAME
Rémi Denis-Courmont
git at videolan.org
Wed May 17 19:34:55 CEST 2017
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 17 20:26:31 2017 +0300| [9b34d606bd79d6fff32ebc6436d88fdf97489c46] | committer: Rémi Denis-Courmont
input: remove unused INPUT_SET_NAME
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b34d606bd79d6fff32ebc6436d88fdf97489c46
---
include/vlc_input.h | 3 ---
modules/gui/macosx/VLCInputManager.m | 4 ----
modules/gui/qt/input_manager.cpp | 6 ------
modules/gui/qt/input_manager.hpp | 1 -
src/input/control.c | 13 -------------
src/input/event.c | 15 ---------------
src/input/event.h | 1 -
7 files changed, 43 deletions(-)
diff --git a/include/vlc_input.h b/include/vlc_input.h
index 76ecee5267..e72dc6a10f 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -360,8 +360,6 @@ typedef enum input_event_type_e
INPUT_EVENT_ITEM_META,
/* input_item_t info has changed */
INPUT_EVENT_ITEM_INFO,
- /* input_item_t name has changed */
- INPUT_EVENT_ITEM_NAME,
/* input_item_t epg has changed */
INPUT_EVENT_ITEM_EPG,
@@ -440,7 +438,6 @@ enum input_query_e
INPUT_MERGE_INFOS,/* arg1= info_category_t * res=cannot fail */
INPUT_GET_INFO, /* arg1= char* arg2= char* arg3= char** res=can fail */
INPUT_DEL_INFO, /* arg1= char* arg2= char* res=can fail */
- INPUT_SET_NAME, /* arg1= char* res=can fail */
/* bookmarks */
INPUT_GET_BOOKMARK, /* arg1= seekpoint_t * res=can fail */
diff --git a/modules/gui/macosx/VLCInputManager.m b/modules/gui/macosx/VLCInputManager.m
index cbd4d0e36f..67f38a0b21 100644
--- a/modules/gui/macosx/VLCInputManager.m
+++ b/modules/gui/macosx/VLCInputManager.m
@@ -115,10 +115,6 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var,
case INPUT_EVENT_SIGNAL:
break;
- case INPUT_EVENT_ITEM_NAME:
- [inputManager performSelectorOnMainThread:@selector(updateName) withObject: nil waitUntilDone:NO];
- break;
-
case INPUT_EVENT_AUDIO_DELAY:
case INPUT_EVENT_SUBTITLE_DELAY:
[inputManager performSelectorOnMainThread:@selector(updateDelays) withObject:nil waitUntilDone:NO];
diff --git a/modules/gui/qt/input_manager.cpp b/modules/gui/qt/input_manager.cpp
index 55e05531a6..d5285cf6a0 100644
--- a/modules/gui/qt/input_manager.cpp
+++ b/modules/gui/qt/input_manager.cpp
@@ -250,9 +250,6 @@ void InputManager::customEvent( QEvent *event )
case IMEvent::ItemStateChanged:
UpdateStatus();
break;
- case IMEvent::NameChanged:
- UpdateName();
- break;
case IMEvent::MetaChanged:
UpdateMeta();
UpdateName(); /* Needed for NowPlaying */
@@ -377,9 +374,6 @@ static int InputEvent( vlc_object_t *, const char *,
case INPUT_EVENT_ITEM_INFO: /* Codec Info */
event = new IMEvent( IMEvent::InfoChanged );
break;
- case INPUT_EVENT_ITEM_NAME:
- event = new IMEvent( IMEvent::NameChanged );
- break;
case INPUT_EVENT_AUDIO_DELAY:
case INPUT_EVENT_SUBTITLE_DELAY:
diff --git a/modules/gui/qt/input_manager.hpp b/modules/gui/qt/input_manager.hpp
index e79471ef0f..1c87f8b5d6 100644
--- a/modules/gui/qt/input_manager.hpp
+++ b/modules/gui/qt/input_manager.hpp
@@ -59,7 +59,6 @@ public:
StatisticsUpdate,
InterfaceAoutUpdate, /* 10 */
MetaChanged,
- NameChanged,
InfoChanged,
SynchroChanged,
CachingEvent,
diff --git a/src/input/control.c b/src/input/control.c
index d840ceebeb..55125d522f 100644
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -205,19 +205,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
return i_ret;
}
- case INPUT_SET_NAME:
- {
- char *psz_name = (char *)va_arg( args, char * );
-
- if( !psz_name ) return VLC_EGENERIC;
-
- input_item_SetName( priv->p_item, psz_name );
-
- if( !priv->b_preparsing )
- input_SendEventMetaName( p_input, psz_name );
- return VLC_SUCCESS;
- }
-
case INPUT_ADD_BOOKMARK:
p_bkmk = (seekpoint_t *)va_arg( args, seekpoint_t * );
p_bkmk = vlc_seekpoint_Duplicate( p_bkmk );
diff --git a/src/input/event.c b/src/input/event.c
index a913c16ceb..5eab872d12 100644
--- a/src/input/event.c
+++ b/src/input/event.c
@@ -189,9 +189,6 @@ void input_SendEventCache( input_thread_t *p_input, double f_level )
Trigger( p_input, INPUT_EVENT_CACHE );
}
-/* FIXME: review them because vlc_event_send might be
- * moved inside input_item* functions.
- */
void input_SendEventMeta( input_thread_t *p_input )
{
Trigger( p_input, INPUT_EVENT_ITEM_META );
@@ -202,18 +199,6 @@ void input_SendEventMetaInfo( input_thread_t *p_input )
Trigger( p_input, INPUT_EVENT_ITEM_INFO );
}
-void input_SendEventMetaName( input_thread_t *p_input, const char *psz_name )
-{
- Trigger( p_input, INPUT_EVENT_ITEM_NAME );
-
- /* FIXME remove this ugliness */
- vlc_event_t event;
-
- event.type = vlc_InputItemNameChanged;
- event.u.input_item_name_changed.new_name = psz_name;
- vlc_event_send( &input_priv(p_input)->p_item->event_manager, &event );
-}
-
void input_SendEventMetaEpg( input_thread_t *p_input )
{
Trigger( p_input, INPUT_EVENT_ITEM_EPG );
diff --git a/src/input/event.h b/src/input/event.h
index e91ad112d2..d936f3c304 100644
--- a/src/input/event.h
+++ b/src/input/event.h
@@ -46,7 +46,6 @@ void input_SendEventCache( input_thread_t *p_input, double f_level );
/* TODO rename Item* */
void input_SendEventMeta( input_thread_t *p_input );
void input_SendEventMetaInfo( input_thread_t *p_input );
-void input_SendEventMetaName( input_thread_t *p_input, const char *psz_name );
void input_SendEventMetaEpg( input_thread_t *p_input );
/*****************************************************************************
More information about the vlc-commits
mailing list