[vlc-commits] input: remove INPUT_EVENT_AOUT
Thomas Guillem
git at videolan.org
Fri Sep 7 15:26:01 CEST 2018
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Sep 7 14:55:28 2018 +0200| [02442c0f4e12f5c06ff01e85b492a05b4ae1bdd7] | committer: Thomas Guillem
input: remove INPUT_EVENT_AOUT
This event was not used. The aout is unique and created by the playlist (and by
vlc_player in the future), we don't need to send any events for its
creation/deletion.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=02442c0f4e12f5c06ff01e85b492a05b4ae1bdd7
---
include/vlc_input.h | 2 --
modules/gui/macosx/VLCInputManager.m | 2 --
modules/gui/qt/input_manager.cpp | 11 -----------
modules/gui/qt/input_manager.hpp | 8 +++-----
modules/gui/skins2/src/vlcproc.cpp | 1 -
src/input/decoder.c | 5 -----
src/input/event.h | 7 -------
src/input/var.c | 2 --
8 files changed, 3 insertions(+), 35 deletions(-)
diff --git a/include/vlc_input.h b/include/vlc_input.h
index e8a12d0ff5..8076876506 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -382,8 +382,6 @@ typedef enum input_event_type_e
/* cache" has changed */
INPUT_EVENT_CACHE,
- /* A audio_output_t object has been created/deleted by *the input* */
- INPUT_EVENT_AOUT,
/* A vout_thread_t object has been created/deleted by *the input* */
INPUT_EVENT_VOUT,
diff --git a/modules/gui/macosx/VLCInputManager.m b/modules/gui/macosx/VLCInputManager.m
index 3193e744f8..b01ac10bf0 100644
--- a/modules/gui/macosx/VLCInputManager.m
+++ b/modules/gui/macosx/VLCInputManager.m
@@ -100,8 +100,6 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var,
break;
case INPUT_EVENT_ES:
break;
- case INPUT_EVENT_AOUT:
- break;
case INPUT_EVENT_VOUT:
break;
case INPUT_EVENT_ITEM_META:
diff --git a/modules/gui/qt/input_manager.cpp b/modules/gui/qt/input_manager.cpp
index 9509adfa2c..0f8c07e981 100644
--- a/modules/gui/qt/input_manager.cpp
+++ b/modules/gui/qt/input_manager.cpp
@@ -283,9 +283,6 @@ void InputManager::customEvent( QEvent *event )
case IMEvent::BookmarksChanged:
emit bookmarksChanged();
break;
- case IMEvent::InterfaceAoutUpdate:
- UpdateAout();
- break;
case IMEvent::RecordingEvent:
UpdateRecord();
break;
@@ -363,9 +360,6 @@ static int InputEvent( vlc_object_t *, const char *,
case INPUT_EVENT_VOUT:
event = new IMEvent( IMEvent::InterfaceVoutUpdate );
break;
- case INPUT_EVENT_AOUT:
- event = new IMEvent( IMEvent::InterfaceAoutUpdate );
- break;
case INPUT_EVENT_ITEM_META: /* Codec MetaData + Art */
event = new IMEvent( IMEvent::MetaChanged );
@@ -656,11 +650,6 @@ void InputManager::UpdateVout()
free( pp_vout );
}
-void InputManager::UpdateAout()
-{
- /* TODO */
-}
-
void InputManager::UpdateCaching()
{
float f_newCache = var_GetFloat ( p_input, "cache" );
diff --git a/modules/gui/qt/input_manager.hpp b/modules/gui/qt/input_manager.hpp
index 305891124c..ce515cdaab 100644
--- a/modules/gui/qt/input_manager.hpp
+++ b/modules/gui/qt/input_manager.hpp
@@ -57,8 +57,7 @@ public:
ItemTeletextChanged,
InterfaceVoutUpdate,
StatisticsUpdate,
- InterfaceAoutUpdate, /* 10 */
- MetaChanged,
+ MetaChanged, /* 10 */
InfoChanged,
SynchroChanged,
CachingEvent,
@@ -66,8 +65,8 @@ public:
RecordingEvent,
ProgramChanged,
RandomChanged,
- LoopOrRepeatChanged, /* 20 */
- EPGEvent,
+ LoopOrRepeatChanged,
+ EPGEvent, /* 20 */
CapabilitiesChanged,
/* SignalChanged, */
@@ -176,7 +175,6 @@ private:
void UpdateMeta();
void UpdateMeta(input_item_t *);
void UpdateVout();
- void UpdateAout();
void UpdateStats();
void UpdateCaching();
void UpdateRecord();
diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index ba2fdf3211..43b43d1114 100644
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -406,7 +406,6 @@ int VlcProc::onGenericCallback2( vlc_object_t *pObj, const char *pVariable,
b_remove = true;
break;
case INPUT_EVENT_VOUT:
- case INPUT_EVENT_AOUT:
case INPUT_EVENT_DEAD:
b_remove = false;
break;
diff --git a/src/input/decoder.c b/src/input/decoder.c
index 251fae2ec0..c4ad7ab551 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -409,9 +409,6 @@ static int aout_update_format( decoder_t *p_dec )
aout_FormatPrepare( &p_owner->fmt.audio );
vlc_mutex_unlock( &p_owner->lock );
- if( p_owner->p_input != NULL )
- input_SendEventAout( p_owner->p_input );
-
if( p_aout == NULL )
{
msg_Err( p_dec, "failed to create audio output" );
@@ -1905,8 +1902,6 @@ static void DeleteDecoder( decoder_t * p_dec )
aout_DecFlush( p_owner->p_aout, false );
aout_DecDelete( p_owner->p_aout );
input_resource_PutAout( p_owner->p_resource, p_owner->p_aout );
- if( p_owner->p_input != NULL )
- input_SendEventAout( p_owner->p_input );
}
break;
case VIDEO_ES:
diff --git a/src/input/event.h b/src/input/event.h
index 3d3850019f..03774a8d2c 100644
--- a/src/input/event.h
+++ b/src/input/event.h
@@ -259,13 +259,6 @@ static inline void input_SendEventVout(input_thread_t *p_input)
});
}
-static inline void input_SendEventAout(input_thread_t *p_input)
-{
- input_SendEvent(p_input, &(struct vlc_input_event) {
- .type = INPUT_EVENT_AOUT
- });
-}
-
/*****************************************************************************
* Event for control.c/input.c
*****************************************************************************/
diff --git a/src/input/var.c b/src/input/var.c
index 6ffa5d878a..47d688262d 100644
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -412,8 +412,6 @@ void input_LegacyEvents( input_thread_t *p_input,
val.f_float = event->cache;
var_Change( p_input, "cache", VLC_VAR_SETVALUE, val );
break;
- case INPUT_EVENT_AOUT:
- break;
case INPUT_EVENT_VOUT:
break;
case INPUT_EVENT_SUBITEMS:
More information about the vlc-commits
mailing list