/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_meta.h>
#include <vlc_playlist.h>
+#include <vlc_strings.h>
/*****************************************************************************
* intf_sys_t: description and status of log interface
static int ItemChange( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * );
-static int SendToMSN( char * psz_msg );
+static int SendToMSN( const char * psz_msg );
#define MSN_MAX_LENGTH 256
#define FORMAT_LONGTEXT N_("Format of the string to send to MSN " \
"{0} Artist, {1} Title, {2} Album. Defaults to \"Artist - Title\" ({0} - {1}).")
-vlc_module_begin();
- set_category( CAT_INTERFACE );
- set_subcategory( SUBCAT_INTERFACE_CONTROL );
- set_shortname( "MSN" );
- set_description( _("MSN Now-Playing") );
+vlc_module_begin ()
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_CONTROL )
+ set_shortname( "MSN" )
+ set_description( N_("MSN Now-Playing") )
add_string( "msn-format", FORMAT_DEFAULT, NULL,
- FORMAT_TEXT, FORMAT_LONGTEXT, VLC_FALSE );
+ FORMAT_TEXT, FORMAT_LONGTEXT, false )
- set_capability( "interface", 0 );
- set_callbacks( Open, Close );
-vlc_module_end();
+ set_capability( "interface", 0 )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Open: initialize and create stuff
intf_thread_t *p_intf = (intf_thread_t *)p_this;
playlist_t *p_playlist;
- MALLOC_ERR( p_intf->p_sys, intf_sys_t );
+ p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
+ if( !p_intf->p_sys )
+ return VLC_ENOMEM;
p_intf->p_sys->psz_format = config_GetPsz( p_intf, "msn-format" );
if( !p_intf->p_sys->psz_format )
}
msg_Dbg( p_intf, "using format: %s", p_intf->p_sys->psz_format );
- p_playlist = pl_Yield( p_intf );
+ p_playlist = pl_Hold( p_intf );
var_AddCallback( p_playlist, "item-change", ItemChange, p_intf );
- var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+ var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
pl_Release( p_intf );
return VLC_SUCCESS;
static void Close( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- playlist_t *p_playlist = pl_Yield( p_this );
+ playlist_t *p_playlist = pl_Hold( p_this );
/* clear the MSN stuff ... else it looks like we're still playing
* something although VLC (or the MSN plugin) is closed */
SendToMSN( "\\0Music\\01\\0\\0\\0\\0\\0\\0\\0" );
var_DelCallback( p_playlist, "item-change", ItemChange, p_intf );
- var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+ var_DelCallback( p_playlist, "item-current", ItemChange, p_intf );
pl_Release( p_this );
/* Destroy structure */
static int ItemChange( vlc_object_t *p_this, const char *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *param )
{
+ (void)psz_var; (void)oldval; (void)newval;
intf_thread_t *p_intf = (intf_thread_t *)param;
char psz_tmp[MSN_MAX_LENGTH];
char *psz_title = NULL;
char *psz_artist = NULL;
char *psz_album = NULL;
- input_thread_t *p_input;
- playlist_t *p_playlist = pl_Yield( p_this );
-
- p_input = p_playlist->p_input;
- pl_Release( p_this );
+ char *psz_buf = NULL;
+ input_thread_t *p_input = playlist_CurrentInput( (playlist_t *) p_this );
if( !p_input ) return VLC_SUCCESS;
- vlc_object_yield( p_input );
if( p_input->b_dead || !input_GetItem(p_input)->psz_name )
{
}
/* Playing something ... */
- psz_artist = input_GetItem(p_input)->p_meta->psz_artist ?
- strdup( input_GetItem(p_input)->p_meta->psz_artist ) :
- strdup( "" );
- psz_album = input_GetItem(p_input)->p_meta->psz_album ?
- strdup( input_GetItem(p_input)->p_meta->psz_album ) :
- strdup( "" );
- psz_title = strdup( input_GetItem(p_input)->psz_name );
- if( psz_title == NULL ) psz_title = strdup( N_("(no title)") );
- if( psz_artist == NULL ) psz_artist = strdup( N_("(no artist)") );
- if( psz_album == NULL ) psz_album = strdup( N_("(no album)") );
+ psz_artist = input_item_GetArtist( input_GetItem( p_input ) );
+ psz_album = input_item_GetAlbum( input_GetItem( p_input ) );
+ psz_title = input_item_GetTitle( input_GetItem( p_input ) );
+ if( !psz_artist ) psz_artist = strdup( "" );
+ if( !psz_album ) psz_album = strdup( "" );
+ if( !psz_title )
+ psz_title = input_item_GetName( input_GetItem( p_input ) );
+
+ psz_buf = str_format_meta( p_this, p_intf->p_sys->psz_format );
+
snprintf( psz_tmp,
MSN_MAX_LENGTH,
"\\0Music\\01\\0%s\\0%s\\0%s\\0%s\\0\\0\\0",
- p_intf->p_sys->psz_format,
+ psz_buf,
psz_artist,
psz_title,
psz_album );
+ free( psz_buf );
free( psz_title );
free( psz_artist );
free( psz_album );
- SendToMSN( psz_tmp );
+ SendToMSN( (const char*)psz_tmp );
vlc_object_release( p_input );
return VLC_SUCCESS;
/*****************************************************************************
* SendToMSN
*****************************************************************************/
-static int SendToMSN( char *psz_msg )
+static int SendToMSN( const char *psz_msg )
{
COPYDATASTRUCT msndata;
HWND msnui = NULL;
wchar_t buffer[MSN_MAX_LENGTH];
- mbstowcs( buffer, psz_msg, MSN_MAX_LENGTH );
+ //mbstowcs( buffer, psz_msg, MSN_MAX_LENGTH );
+ int nLen = MultiByteToWideChar(CP_ACP, 0, psz_msg, -1, NULL, NULL);
+ MultiByteToWideChar(CP_ACP, 0, psz_msg, -1, &buffer, nLen);
msndata.dwData = 0x547;
msndata.lpData = &buffer;
projects / vlc / blobdiff