Skip to content

V
vlc
Commit 1fa9ce8d authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

* Move all notifications plugins to misc/notify 

* Don't find playlist
* Fix a few bugs in notification plugins

Todo: find a way to get rid of this mostly redundant code and rewrite the XOSD plugin
parent 415749bf
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 90 deletions
configure.ac
View file @ 1fa9ce8d
...@@ -5637,6 +5637,7 @@ AC_CONFIG_FILES([ ...@@ -5637,6 +5637,7 @@ AC_CONFIG_FILES([
modules/misc/dummy/Makefile modules/misc/dummy/Makefile
modules/misc/memcpy/Makefile modules/misc/memcpy/Makefile
modules/misc/network/Makefile modules/misc/network/Makefile
modules/misc/notify/Makefile
modules/misc/testsuite/Makefile modules/misc/testsuite/Makefile
modules/misc/playlist/Makefile modules/misc/playlist/Makefile
modules/misc/xml/Makefile modules/misc/xml/Makefile
......
modules/misc/Modules.am
View file @ 1fa9ce8d
...@@ -10,7 +10,4 @@ SOURCES_logger = logger.c ...@@ -10,7 +10,4 @@ SOURCES_logger = logger.c
SOURCES_vod_rtsp = rtsp.c SOURCES_vod_rtsp = rtsp.c
SOURCES_gnutls = gnutls.c SOURCES_gnutls = gnutls.c
SOURCES_svg = svg.c SOURCES_svg = svg.c
SOURCES_msn = msn.c
SOURCES_growl = growl.c
SOURCES_notify = notify.c
SOURCES_profile_parser = profile_parser.c SOURCES_profile_parser = profile_parser.c
modules/misc/notify/Modules.am 0 → 100644
View file @ 1fa9ce8d
SOURCES_msn = msn.c
SOURCES_growl = growl.c
SOURCES_notify = notify.c
SOURCES_xosd = xosd.c
modules/misc/growl.c → modules/misc/notify/growl.c
View file @ 1fa9ce8d
...@@ -126,18 +126,15 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -126,18 +126,15 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param ) vlc_value_t oldval, vlc_value_t newval, void *param )
{ {
char psz_tmp[GROWL_MAX_LENGTH]; char psz_tmp[GROWL_MAX_LENGTH];
playlist_t *p_playlist;
char *psz_title = NULL; char *psz_title = NULL;
char *psz_artist = NULL; char *psz_artist = NULL;
char *psz_album = NULL; char *psz_album = NULL;
input_thread_t *p_input; input_thread_t *p_input;
playlist_t *p_playlist = pl_Yield( p_this );
p_playlist = (playlist_t *)vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( !p_playlist ) return VLC_EGENERIC;
p_input = p_playlist->p_input; p_input = p_playlist->p_input;
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
if( !p_input ) return VLC_SUCCESS; if( !p_input ) return VLC_SUCCESS;
vlc_object_yield( p_input ); vlc_object_yield( p_input );
......
modules/misc/msn.c → modules/misc/notify/msn.c
View file @ 1fa9ce8d
...@@ -86,13 +86,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -86,13 +86,7 @@ static int Open( vlc_object_t *p_this )
intf_thread_t *p_intf = (intf_thread_t *)p_this; intf_thread_t *p_intf = (intf_thread_t *)p_this;
playlist_t *p_playlist; playlist_t *p_playlist;
/* Allocate instance and initialize some members */ MALLOC_ERR( p_intf->p_sys, intf_sys_t );
p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
if( p_intf->p_sys == NULL )
{
msg_Err( p_intf, "out of memory" );
return -1;
}
p_intf->p_sys->psz_format = config_GetPsz( p_intf, "msn-format" ); p_intf->p_sys->psz_format = config_GetPsz( p_intf, "msn-format" );
if( !p_intf->p_sys->psz_format ) if( !p_intf->p_sys->psz_format )
...@@ -102,22 +96,10 @@ static int Open( vlc_object_t *p_this ) ...@@ -102,22 +96,10 @@ static int Open( vlc_object_t *p_this )
} }
msg_Dbg( p_intf, "using format: %s", p_intf->p_sys->psz_format ); msg_Dbg( p_intf, "using format: %s", p_intf->p_sys->psz_format );
p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, p_playlist = pl_Yield( p_intf );
FIND_ANYWHERE );
if( !p_playlist )
{
msg_Err( p_intf, "could not find playlist object" );
free( p_intf->p_sys->psz_format );
free( p_intf->p_sys );
return VLC_ENOOBJ;
}
/* Item's info changes */
var_AddCallback( p_playlist, "item-change", ItemChange, p_intf ); var_AddCallback( p_playlist, "item-change", ItemChange, p_intf );
/* We're playing a new item */
var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf ); var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
vlc_object_release( p_playlist ); pl_Release( p_intf );
p_intf->pf_run = Run; p_intf->pf_run = Run;
...@@ -130,19 +112,15 @@ static int Open( vlc_object_t *p_this ) ...@@ -130,19 +112,15 @@ static int Open( vlc_object_t *p_this )
static void Close( vlc_object_t *p_this ) static void Close( vlc_object_t *p_this )
{ {
intf_thread_t *p_intf = (intf_thread_t *)p_this; intf_thread_t *p_intf = (intf_thread_t *)p_this;
playlist_t *p_playlist = (playlist_t *)vlc_object_find( playlist_t *p_playlist = pl_Yield( p_this );
p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
/* clear the MSN stuff ... else it looks like we're still playing /* clear the MSN stuff ... else it looks like we're still playing
* something although VLC (or the MSN plugin) is closed */ * something although VLC (or the MSN plugin) is closed */
SendToMSN( "\\0Music\\01\\0\\0\\0\\0\\0\\0\\0" ); SendToMSN( "\\0Music\\01\\0\\0\\0\\0\\0\\0\\0" );
if( p_playlist )
{
var_DelCallback( p_playlist, "item-change", ItemChange, p_intf ); var_DelCallback( p_playlist, "item-change", ItemChange, p_intf );
var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf ); var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
} pl_Release( p_this );
/* Destroy structure */ /* Destroy structure */
free( p_intf->p_sys->psz_format ); free( p_intf->p_sys->psz_format );
...@@ -164,22 +142,16 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -164,22 +142,16 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param ) vlc_value_t oldval, vlc_value_t newval, void *param )
{ {
intf_thread_t *p_intf = (intf_thread_t *)param; intf_thread_t *p_intf = (intf_thread_t *)param;
playlist_t *p_playlist;
char psz_tmp[MSN_MAX_LENGTH]; char psz_tmp[MSN_MAX_LENGTH];
char *psz_title = NULL; char *psz_title = NULL;
char *psz_artist = NULL; char *psz_artist = NULL;
char *psz_album = NULL; char *psz_album = NULL;
input_thread_t *p_input; input_thread_t *p_input;
playlist_t *p_playlist = pl_Yield( p_this );
if( !p_intf->p_sys ) return VLC_SUCCESS;
p_playlist = (playlist_t *)vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( !p_playlist ) return VLC_EGENERIC;
p_input = p_playlist->p_input; p_input = p_playlist->p_input;
vlc_object_release( p_playlist ); pl_Release( p_this );
if( !p_input ) return VLC_SUCCESS; if( !p_input ) return VLC_SUCCESS;
vlc_object_yield( p_input ); vlc_object_yield( p_input );
......
modules/misc/notify.c → modules/misc/notify/notify.c
View file @ 1fa9ce8d
...@@ -74,28 +74,19 @@ vlc_module_end(); ...@@ -74,28 +74,19 @@ vlc_module_end();
static int Open( vlc_object_t *p_this ) static int Open( vlc_object_t *p_this )
{ {
intf_thread_t *p_intf = (intf_thread_t *)p_this; intf_thread_t *p_intf = (intf_thread_t *)p_this;
playlist_t *p_playlist;
playlist_t *p_playlist = (playlist_t *)vlc_object_find(
p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( !p_playlist )
{
msg_Err( p_intf, "could not find playlist object" );
return VLC_ENOOBJ;
}
var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
/* var_AddCallback( p_playlist, "item-change", ItemChange, p_intf );*/
vlc_object_release( p_playlist );
if( !notify_init( APPLICATION_NAME ) ) if( !notify_init( APPLICATION_NAME ) )
{ {
msg_Err( p_intf, "can't find notification daemon" ); msg_Err( p_intf, "can't find notification daemon" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
p_playlist = pl_Yield( p_intf );
var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
pl_Release( p_intf );
p_intf->pf_run = Run; p_intf->pf_run = Run;
msg_Dbg( p_intf,"notify plugin started");
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -104,14 +95,9 @@ static int Open( vlc_object_t *p_this ) ...@@ -104,14 +95,9 @@ static int Open( vlc_object_t *p_this )
*****************************************************************************/ *****************************************************************************/
static void Close( vlc_object_t *p_this ) static void Close( vlc_object_t *p_this )
{ {
playlist_t *p_playlist = (playlist_t *)vlc_object_find( playlist_t *p_playlist = pl_Yield( p_intf );
p_this, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist )
{
var_DelCallback( p_playlist, "playlist-current", ItemChange, p_this ); var_DelCallback( p_playlist, "playlist-current", ItemChange, p_this );
vlc_object_release( p_playlist ); pl_Release( p_intf );
}
notify_uninit(); notify_uninit();
} }
...@@ -121,7 +107,7 @@ static void Close( vlc_object_t *p_this ) ...@@ -121,7 +107,7 @@ static void Close( vlc_object_t *p_this )
*****************************************************************************/ *****************************************************************************/
static void Run( intf_thread_t *p_this ) static void Run( intf_thread_t *p_this )
{ {
msleep( 100*INTF_IDLE_SLEEP ); msleep( 10*INTF_IDLE_SLEEP );
} }
/***************************************************************************** /*****************************************************************************
...@@ -136,12 +122,11 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -136,12 +122,11 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
char *psz_artist = NULL; char *psz_artist = NULL;
char *psz_album = NULL; char *psz_album = NULL;
input_thread_t *p_input=NULL; input_thread_t *p_input=NULL;
p_playlist = (playlist_t *)vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, playlist_t * p_playlist = pl_Yield( p_this );
FIND_ANYWHERE );
if( !p_playlist ) return VLC_EGENERIC;
p_input = p_playlist->p_input; p_input = p_playlist->p_input;
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
if( !p_input ) return VLC_SUCCESS; if( !p_input ) return VLC_SUCCESS;
vlc_object_yield( p_input ); vlc_object_yield( p_input );
......
modules/visualization/xosd.c → modules/misc/notify/xosd.c
View file @ 1fa9ce8d
...@@ -141,18 +141,10 @@ static int Open( vlc_object_t *p_this ) ...@@ -141,18 +141,10 @@ static int Open( vlc_object_t *p_this )
#endif #endif
playlist_t *p_playlist = playlist_t *p_playlist = pl_Yield( p_intf );
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
{
return VLC_EGENERIC;
}
var_AddCallback( p_playlist, "playlist-current", PlaylistNext, p_this ); var_AddCallback( p_playlist, "playlist-current", PlaylistNext, p_this );
var_AddCallback( p_playlist, "item-change", PlaylistNext, p_this ); var_AddCallback( p_playlist, "item-change", PlaylistNext, p_this );
pl_Release( p_intf );
vlc_object_release( p_playlist );
/* Set user preferences */ /* Set user preferences */
xosd_set_font( p_intf->p_sys->p_osd, xosd_set_font( p_intf->p_sys->p_osd,
...@@ -189,6 +181,10 @@ static int Open( vlc_object_t *p_this ) ...@@ -189,6 +181,10 @@ static int Open( vlc_object_t *p_this )
static void Close( vlc_object_t *p_this ) static void Close( vlc_object_t *p_this )
{ {
intf_thread_t *p_intf = (intf_thread_t *)p_this; intf_thread_t *p_intf = (intf_thread_t *)p_this;
playlist_t *p_playlist = pl_Yield( p_intf );
var_DelCallback( p_playlist, "playlist-current", PlaylistNext, p_this );
var_DelCallback( p_playlist, "item-change", PlaylistNext, p_this );
pl_Release( p_intf );
/* Uninitialize library */ /* Uninitialize library */
xosd_destroy( p_intf->p_sys->p_osd ); xosd_destroy( p_intf->p_sys->p_osd );
...@@ -215,12 +211,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -215,12 +211,7 @@ static void Run( intf_thread_t *p_intf )
if( p_intf->p_sys->b_need_update == VLC_TRUE ) if( p_intf->p_sys->b_need_update == VLC_TRUE )
{ {
p_intf->p_sys->b_need_update = VLC_FALSE; p_intf->p_sys->b_need_update = VLC_FALSE;
p_playlist = (playlist_t *)vlc_object_find( p_intf, p_playlist = pl_Yield( p_intf );
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( !p_playlist )
{
continue;
}
if( p_playlist->i_size < 0 ) if( p_playlist->i_size < 0 )
{ {
......
modules/visualization/Modules.am
View file @ 1fa9ce8d
SOURCES_goom = goom.c SOURCES_goom = goom.c
SOURCES_xosd = xosd.c
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