Commit 9b34d606 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

input: remove unused INPUT_SET_NAME

parent 469c0f3b
...@@ -360,8 +360,6 @@ typedef enum input_event_type_e ...@@ -360,8 +360,6 @@ typedef enum input_event_type_e
INPUT_EVENT_ITEM_META, INPUT_EVENT_ITEM_META,
/* input_item_t info has changed */ /* input_item_t info has changed */
INPUT_EVENT_ITEM_INFO, INPUT_EVENT_ITEM_INFO,
/* input_item_t name has changed */
INPUT_EVENT_ITEM_NAME,
/* input_item_t epg has changed */ /* input_item_t epg has changed */
INPUT_EVENT_ITEM_EPG, INPUT_EVENT_ITEM_EPG,
...@@ -440,7 +438,6 @@ enum input_query_e ...@@ -440,7 +438,6 @@ enum input_query_e
INPUT_MERGE_INFOS,/* arg1= info_category_t * res=cannot fail */ INPUT_MERGE_INFOS,/* arg1= info_category_t * res=cannot fail */
INPUT_GET_INFO, /* arg1= char* arg2= char* arg3= char** res=can fail */ INPUT_GET_INFO, /* arg1= char* arg2= char* arg3= char** res=can fail */
INPUT_DEL_INFO, /* arg1= char* arg2= char* res=can fail */ INPUT_DEL_INFO, /* arg1= char* arg2= char* res=can fail */
INPUT_SET_NAME, /* arg1= char* res=can fail */
/* bookmarks */ /* bookmarks */
INPUT_GET_BOOKMARK, /* arg1= seekpoint_t * res=can fail */ INPUT_GET_BOOKMARK, /* arg1= seekpoint_t * res=can fail */
......
...@@ -115,10 +115,6 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var, ...@@ -115,10 +115,6 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var,
case INPUT_EVENT_SIGNAL: case INPUT_EVENT_SIGNAL:
break; break;
case INPUT_EVENT_ITEM_NAME:
[inputManager performSelectorOnMainThread:@selector(updateName) withObject: nil waitUntilDone:NO];
break;
case INPUT_EVENT_AUDIO_DELAY: case INPUT_EVENT_AUDIO_DELAY:
case INPUT_EVENT_SUBTITLE_DELAY: case INPUT_EVENT_SUBTITLE_DELAY:
[inputManager performSelectorOnMainThread:@selector(updateDelays) withObject:nil waitUntilDone:NO]; [inputManager performSelectorOnMainThread:@selector(updateDelays) withObject:nil waitUntilDone:NO];
......
...@@ -250,9 +250,6 @@ void InputManager::customEvent( QEvent *event ) ...@@ -250,9 +250,6 @@ void InputManager::customEvent( QEvent *event )
case IMEvent::ItemStateChanged: case IMEvent::ItemStateChanged:
UpdateStatus(); UpdateStatus();
break; break;
case IMEvent::NameChanged:
UpdateName();
break;
case IMEvent::MetaChanged: case IMEvent::MetaChanged:
UpdateMeta(); UpdateMeta();
UpdateName(); /* Needed for NowPlaying */ UpdateName(); /* Needed for NowPlaying */
...@@ -377,9 +374,6 @@ static int InputEvent( vlc_object_t *, const char *, ...@@ -377,9 +374,6 @@ static int InputEvent( vlc_object_t *, const char *,
case INPUT_EVENT_ITEM_INFO: /* Codec Info */ case INPUT_EVENT_ITEM_INFO: /* Codec Info */
event = new IMEvent( IMEvent::InfoChanged ); event = new IMEvent( IMEvent::InfoChanged );
break; break;
case INPUT_EVENT_ITEM_NAME:
event = new IMEvent( IMEvent::NameChanged );
break;
case INPUT_EVENT_AUDIO_DELAY: case INPUT_EVENT_AUDIO_DELAY:
case INPUT_EVENT_SUBTITLE_DELAY: case INPUT_EVENT_SUBTITLE_DELAY:
......
...@@ -59,7 +59,6 @@ public: ...@@ -59,7 +59,6 @@ public:
StatisticsUpdate, StatisticsUpdate,
InterfaceAoutUpdate, /* 10 */ InterfaceAoutUpdate, /* 10 */
MetaChanged, MetaChanged,
NameChanged,
InfoChanged, InfoChanged,
SynchroChanged, SynchroChanged,
CachingEvent, CachingEvent,
......
...@@ -205,19 +205,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) ...@@ -205,19 +205,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
return i_ret; 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: case INPUT_ADD_BOOKMARK:
p_bkmk = (seekpoint_t *)va_arg( args, seekpoint_t * ); p_bkmk = (seekpoint_t *)va_arg( args, seekpoint_t * );
p_bkmk = vlc_seekpoint_Duplicate( p_bkmk ); p_bkmk = vlc_seekpoint_Duplicate( p_bkmk );
......
...@@ -189,9 +189,6 @@ void input_SendEventCache( input_thread_t *p_input, double f_level ) ...@@ -189,9 +189,6 @@ void input_SendEventCache( input_thread_t *p_input, double f_level )
Trigger( p_input, INPUT_EVENT_CACHE ); 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 ) void input_SendEventMeta( input_thread_t *p_input )
{ {
Trigger( p_input, INPUT_EVENT_ITEM_META ); Trigger( p_input, INPUT_EVENT_ITEM_META );
...@@ -202,18 +199,6 @@ void input_SendEventMetaInfo( input_thread_t *p_input ) ...@@ -202,18 +199,6 @@ void input_SendEventMetaInfo( input_thread_t *p_input )
Trigger( p_input, INPUT_EVENT_ITEM_INFO ); 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 ) void input_SendEventMetaEpg( input_thread_t *p_input )
{ {
Trigger( p_input, INPUT_EVENT_ITEM_EPG ); Trigger( p_input, INPUT_EVENT_ITEM_EPG );
......
...@@ -46,7 +46,6 @@ void input_SendEventCache( input_thread_t *p_input, double f_level ); ...@@ -46,7 +46,6 @@ void input_SendEventCache( input_thread_t *p_input, double f_level );
/* TODO rename Item* */ /* TODO rename Item* */
void input_SendEventMeta( input_thread_t *p_input ); void input_SendEventMeta( input_thread_t *p_input );
void input_SendEventMetaInfo( 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 ); void input_SendEventMetaEpg( input_thread_t *p_input );
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment