[vlc-commits] commit: Moved "vout-filter" change support from vout to playlist. ( Laurent Aimar )
git at videolan.org
git at videolan.org
Mon Oct 25 20:41:54 CEST 2010
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Oct 23 23:06:08 2010 +0200| [35e5c857347e6d3d65103aaca8e5b5aa0b861741] | committer: Laurent Aimar
Moved "vout-filter" change support from vout to playlist.
Vout does not support on the fly changes, and an action on the input is needed.
As such, it only belong to the input manager (hence the playlist). It also
remove another vlc_object_find(PARENT).
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=35e5c857347e6d3d65103aaca8e5b5aa0b861741
---
src/playlist/engine.c | 18 +++++++++++++
src/video_output/video_output.c | 6 ++--
src/video_output/vout_intf.c | 54 +-------------------------------------
3 files changed, 23 insertions(+), 55 deletions(-)
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 285c73f..7ee856d 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -130,6 +130,21 @@ static int RateOffsetCallback( vlc_object_t *p_this, char const *psz_cmd,
return VLC_SUCCESS;
}
+static int VideoSplitterCallback( vlc_object_t *p_this, char const *psz_cmd,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ playlist_t *p_playlist = (playlist_t*)p_this;
+
+ PL_LOCK;
+
+ /* Force the input to restart the video ES to force a vout recreation */
+ input_thread_t *p_input = pl_priv( p_playlist )->p_input;
+ if( p_input )
+ input_Control( p_input, INPUT_RESTART_ES, -VIDEO_ES );
+
+ PL_UNLOCK;
+ return VLC_SUCCESS;
+}
/**
* Create playlist
@@ -399,6 +414,9 @@ static void VariablesInit( playlist_t *p_playlist )
var_AddCallback( p_playlist, "rate-slower", RateOffsetCallback, NULL );
var_AddCallback( p_playlist, "rate-faster", RateOffsetCallback, NULL );
+ var_Create( p_playlist, "vout-filter", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_AddCallback( p_playlist, "vout-filter", VideoSplitterCallback, NULL );
+
var_AddCallback( p_playlist, "random", RandomCallback, NULL );
/* */
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index e5d11ef..dd2574a 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -141,14 +141,14 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
vout->p->title.position = var_GetInteger(vout, "video-title-position");
/* Get splitter name if present */
- char *splitter_name = var_GetNonEmptyString(vout, "vout-filter");
- if (splitter_name) {
+ char *splitter_name = var_InheritString(vout, "vout-filter");
+ if (splitter_name && *splitter_name) {
if (asprintf(&vout->p->splitter_name, "%s,none", splitter_name) < 0)
vout->p->splitter_name = NULL;
- free(splitter_name);
} else {
vout->p->splitter_name = NULL;
}
+ free(splitter_name);
/* */
vout_InitInterlacingSupport(vout, vout->p->displayed.is_interlaced);
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index cd1e6a9..1398d80 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -41,7 +41,6 @@
#include <vlc_vout_osd.h>
#include <vlc_strings.h>
#include <vlc_charset.h>
-#include "../libvlc.h"
#include "vout_internal.h"
/*****************************************************************************
@@ -66,8 +65,6 @@ static int SnapshotCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int VideoFilterCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
-static int VideoSplitterCallback( vlc_object_t *, char const *,
- vlc_value_t, vlc_value_t, void * );
static int SubFilterCallback( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * );
static int SubMarginCallback( vlc_object_t *, char const *,
@@ -318,14 +315,6 @@ void vout_IntfInit( vout_thread_t *p_vout )
var_AddCallback( p_vout, "video-filter", VideoFilterCallback, NULL );
var_TriggerCallback( p_vout, "video-filter" );
- /* Add a video-splitter variable
- * TODO rename vout-filter into vout-splitter */
- var_Create( p_vout, "vout-filter",
- VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
- text.psz_string = _("Video splitter");
- var_Change( p_vout, "vout-filter", VLC_VAR_SETTEXT, &text, NULL );
- var_AddCallback( p_vout, "vout-filter", VideoSplitterCallback, NULL );
-
/* Add a sub-filter variable */
var_Create( p_vout, "sub-filter",
VLC_VAR_STRING | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND );
@@ -467,27 +456,14 @@ void vout_EnableFilter( vout_thread_t *p_vout, const char *psz_name,
char *psz_string;
const char *psz_filter_type;
- /* FIXME temporary hack */
- const char *psz_module_name = psz_name;
- if( !strcmp( psz_name, "magnify" ) ||
- !strcmp( psz_name, "puzzle" ) ||
- !strcmp( psz_name, "logo" ) ||
- !strcmp( psz_name, "wall" ) ||
- !strcmp( psz_name, "clone" ) )
- psz_module_name = "video_filter_wrapper";
-
- module_t *p_obj = module_find( psz_module_name );
+ module_t *p_obj = module_find( psz_name );
if( !p_obj )
{
msg_Err( p_vout, "Unable to find filter module \"%s\".", psz_name );
return;
}
- if( module_provides( p_obj, "video filter" ) )
- {
- psz_filter_type = "vout-filter";
- }
- else if( module_provides( p_obj, "video filter2" ) )
+ if( module_provides( p_obj, "video filter2" ) )
{
psz_filter_type = "video-filter";
}
@@ -678,32 +654,6 @@ static int VideoFilterCallback( vlc_object_t *p_this, char const *psz_cmd,
return VLC_SUCCESS;
}
-static int VideoSplitterCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- input_thread_t *p_input;
- (void)psz_cmd; (void)oldval; (void)p_data;
-
- p_input = (input_thread_t *)vlc_object_find( p_this, VLC_OBJECT_INPUT,
- FIND_PARENT );
- if (!p_input)
- {
- msg_Err( p_vout, "Input not found" );
- return VLC_EGENERIC;
- }
-
- /* Modify input as well because the vout might have to be restarted */
- var_Create( p_input, "vout-filter", VLC_VAR_STRING );
- var_SetString( p_input, "vout-filter", newval.psz_string );
-
- /* Now restart current video stream */
- input_Control( p_input, INPUT_RESTART_ES, -VIDEO_ES );
- vlc_object_release( p_input );
-
- return VLC_SUCCESS;
-}
-
static int SubFilterCallback( vlc_object_t *p_this, char const *psz_cmd,
vlc_value_t oldval, vlc_value_t newval, void *p_data)
{
More information about the vlc-commits
mailing list