Commit a25584c0 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Growl: remove trailing spaces

parent 1139a10c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* growl.m : growl notification plugin * growl.m : growl notification plugin
***************************************************************************** *****************************************************************************
* VLC specific code: * VLC specific code:
* *
* Copyright © 2008,2011 the VideoLAN team * Copyright © 2008,2011 the VideoLAN team
* $Id$ * $Id$
* *
...@@ -109,25 +109,25 @@ static int Open( vlc_object_t *p_this ) ...@@ -109,25 +109,25 @@ 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;
intf_sys_t *p_sys; intf_sys_t *p_sys;
p_sys = p_intf->p_sys = calloc( 1, sizeof(intf_sys_t) ); p_sys = p_intf->p_sys = calloc( 1, sizeof(intf_sys_t) );
if( !p_sys ) if( !p_sys )
return VLC_ENOMEM; return VLC_ENOMEM;
p_sys->app_name = CFSTR( "VLC media player" ); p_sys->app_name = CFSTR( "VLC media player" );
p_sys->notification_type = CFSTR( "New input playing" ); p_sys->notification_type = CFSTR( "New input playing" );
char *data_path = config_GetDataDir (); char *data_path = config_GetDataDir ();
char buf[strlen (data_path) + sizeof ("/vlc512x512.png")]; char buf[strlen (data_path) + sizeof ("/vlc512x512.png")];
snprintf (buf, sizeof (buf), "%s/vlc512x512.png", data_path); snprintf (buf, sizeof (buf), "%s/vlc512x512.png", data_path);
msg_Dbg( p_this, "looking for icon at %s", buf ); msg_Dbg( p_this, "looking for icon at %s", buf );
free( data_path ); free( data_path );
p_sys->default_icon = (CFDataRef) readFile( buf ); p_sys->default_icon = (CFDataRef) readFile( buf );
p_playlist = pl_Get( p_intf ); p_playlist = pl_Get( p_intf );
var_AddCallback( p_playlist, "item-change", ItemChange, p_intf ); var_AddCallback( p_playlist, "item-change", ItemChange, p_intf );
var_AddCallback( p_playlist, "item-current", ItemChange, p_intf ); var_AddCallback( p_playlist, "item-current", ItemChange, p_intf );
RegisterToGrowl( p_this ); RegisterToGrowl( p_this );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -140,10 +140,10 @@ static void Close( vlc_object_t *p_this ) ...@@ -140,10 +140,10 @@ 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_Get( p_this ); playlist_t *p_playlist = pl_Get( p_this );
intf_sys_t *p_sys = p_intf->p_sys; intf_sys_t *p_sys = p_intf->p_sys;
var_DelCallback( p_playlist, "item-change", ItemChange, p_intf ); var_DelCallback( p_playlist, "item-change", ItemChange, p_intf );
var_DelCallback( p_playlist, "item-current", ItemChange, p_intf ); var_DelCallback( p_playlist, "item-current", ItemChange, p_intf );
CFRelease( p_sys->default_icon ); CFRelease( p_sys->default_icon );
CFRelease( p_sys->app_name ); CFRelease( p_sys->app_name );
CFRelease( p_sys->notification_type ); CFRelease( p_sys->notification_type );
...@@ -157,16 +157,16 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -157,16 +157,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 )
{ {
VLC_UNUSED(oldval); VLC_UNUSED(oldval);
intf_thread_t *p_intf = (intf_thread_t *)param; intf_thread_t *p_intf = (intf_thread_t *)param;
char *psz_tmp = NULL; char *psz_tmp = NULL;
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_item_t *p_item = newval.p_address; input_item_t *p_item = newval.p_address;
bool b_is_item_current = !strcmp( "item-current", psz_var ); bool b_is_item_current = !strcmp( "item-current", psz_var );
/* Don't update each time an item has been preparsed */ /* Don't update each time an item has been preparsed */
if( b_is_item_current ) if( b_is_item_current )
{ /* stores the current input item id */ { /* stores the current input item id */
...@@ -188,22 +188,22 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -188,22 +188,22 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
* We'll limit the number of changes to 1 per input. */ * We'll limit the number of changes to 1 per input. */
if( p_intf->p_sys->i_item_changes > 0 ) if( p_intf->p_sys->i_item_changes > 0 )
return VLC_SUCCESS; return VLC_SUCCESS;
p_intf->p_sys->i_item_changes++; p_intf->p_sys->i_item_changes++;
} }
input_thread_t *p_input = playlist_CurrentInput( (playlist_t*)p_this ); input_thread_t *p_input = playlist_CurrentInput( (playlist_t*)p_this );
if( !p_input ) return VLC_SUCCESS; if( !p_input ) return VLC_SUCCESS;
if( p_input->b_dead || !input_GetItem(p_input)->psz_name ) if( p_input->b_dead || !input_GetItem(p_input)->psz_name )
{ {
/* Not playing anything ... */ /* Not playing anything ... */
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
/* Playing something ... */ /* Playing something ... */
if( input_item_GetNowPlaying( p_item ) ) if( input_item_GetNowPlaying( p_item ) )
psz_title = input_item_GetNowPlaying( p_item ); psz_title = input_item_GetNowPlaying( p_item );
...@@ -215,12 +215,12 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -215,12 +215,12 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
psz_artist = input_item_GetArtist( p_item ); psz_artist = input_item_GetArtist( p_item );
if( EMPTY_STR( psz_artist ) ) FREENULL( psz_artist ); if( EMPTY_STR( psz_artist ) ) FREENULL( psz_artist );
psz_album = input_item_GetAlbum( p_item ) ; psz_album = input_item_GetAlbum( p_item ) ;
if( EMPTY_STR( psz_album ) ) FREENULL( psz_album ); if( EMPTY_STR( psz_album ) ) FREENULL( psz_album );
int i_ret; int i_ret;
if( psz_artist && psz_album ) if( psz_artist && psz_album )
i_ret = asprintf( &psz_tmp, "%s\n%s [%s]", i_ret = asprintf( &psz_tmp, "%s\n%s [%s]",
...@@ -229,7 +229,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -229,7 +229,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
i_ret = asprintf( &psz_tmp, "%s\n%s", psz_title, psz_artist ); i_ret = asprintf( &psz_tmp, "%s\n%s", psz_title, psz_artist );
else else
i_ret = asprintf(&psz_tmp, "%s", psz_title ); i_ret = asprintf(&psz_tmp, "%s", psz_title );
if( i_ret == -1 ) if( i_ret == -1 )
{ {
free( psz_title ); free( psz_title );
...@@ -238,7 +238,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -238,7 +238,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_ENOMEM; return VLC_ENOMEM;
} }
char *psz_arturl = input_item_GetArtURL( p_item ); char *psz_arturl = input_item_GetArtURL( p_item );
if( psz_arturl ) if( psz_arturl )
{ {
...@@ -249,17 +249,17 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -249,17 +249,17 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
CFDataRef art = NULL; CFDataRef art = NULL;
if( psz_arturl ) if( psz_arturl )
art = (CFDataRef) readFile( psz_arturl ); art = (CFDataRef) readFile( psz_arturl );
free( psz_title ); free( psz_title );
free( psz_artist ); free( psz_artist );
free( psz_album ); free( psz_album );
free( psz_arturl ); free( psz_arturl );
NotifyToGrowl( p_intf, psz_tmp, art ); NotifyToGrowl( p_intf, psz_tmp, art );
if( art ) CFRelease( art ); if( art ) CFRelease( art );
free( psz_tmp ); free( psz_tmp );
vlc_object_release( p_input ); vlc_object_release( p_input );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -270,31 +270,31 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, ...@@ -270,31 +270,31 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
static void RegisterToGrowl( vlc_object_t *p_this ) static void RegisterToGrowl( vlc_object_t *p_this )
{ {
intf_sys_t *p_sys = ((intf_thread_t *)p_this)->p_sys; intf_sys_t *p_sys = ((intf_thread_t *)p_this)->p_sys;
CFArrayRef defaultAndAllNotifications = CFArrayCreate( CFArrayRef defaultAndAllNotifications = CFArrayCreate(
kCFAllocatorDefault, (const void **)&(p_sys->notification_type), 1, kCFAllocatorDefault, (const void **)&(p_sys->notification_type), 1,
&kCFTypeArrayCallBacks ); &kCFTypeArrayCallBacks );
CFTypeRef registerKeys[4] = { CFTypeRef registerKeys[4] = {
GROWL_APP_NAME, GROWL_APP_NAME,
GROWL_NOTIFICATIONS_ALL, GROWL_NOTIFICATIONS_ALL,
GROWL_NOTIFICATIONS_DEFAULT, GROWL_NOTIFICATIONS_DEFAULT,
GROWL_APP_ICON GROWL_APP_ICON
}; };
CFTypeRef registerValues[4] = { CFTypeRef registerValues[4] = {
p_sys->app_name, p_sys->app_name,
defaultAndAllNotifications, defaultAndAllNotifications,
defaultAndAllNotifications, defaultAndAllNotifications,
p_sys->default_icon p_sys->default_icon
}; };
CFDictionaryRef registerInfo = CFDictionaryCreate( CFDictionaryRef registerInfo = CFDictionaryCreate(
kCFAllocatorDefault, registerKeys, registerValues, 4, kCFAllocatorDefault, registerKeys, registerValues, 4,
&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks ); &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks );
CFRelease( defaultAndAllNotifications ); CFRelease( defaultAndAllNotifications );
CFNotificationCenterPostNotificationWithOptions( CFNotificationCenterPostNotificationWithOptions(
CFNotificationCenterGetDistributedCenter(), CFNotificationCenterGetDistributedCenter(),
(CFStringRef)GROWL_APP_REGISTRATION, NULL, registerInfo, (CFStringRef)GROWL_APP_REGISTRATION, NULL, registerInfo,
...@@ -305,34 +305,34 @@ static void RegisterToGrowl( vlc_object_t *p_this ) ...@@ -305,34 +305,34 @@ static void RegisterToGrowl( vlc_object_t *p_this )
static void NotifyToGrowl( intf_thread_t *p_intf, const char *psz_desc, CFDataRef art ) static void NotifyToGrowl( intf_thread_t *p_intf, const char *psz_desc, CFDataRef art )
{ {
intf_sys_t *p_sys = p_intf->p_sys; intf_sys_t *p_sys = p_intf->p_sys;
CFStringRef title = CFStringCreateWithCString( kCFAllocatorDefault, _("Now playing"), kCFStringEncodingUTF8 ); CFStringRef title = CFStringCreateWithCString( kCFAllocatorDefault, _("Now playing"), kCFStringEncodingUTF8 );
CFStringRef desc = CFStringCreateWithCString( kCFAllocatorDefault, psz_desc, kCFStringEncodingUTF8 ); CFStringRef desc = CFStringCreateWithCString( kCFAllocatorDefault, psz_desc, kCFStringEncodingUTF8 );
CFMutableDictionaryRef notificationInfo = CFDictionaryCreateMutable( CFMutableDictionaryRef notificationInfo = CFDictionaryCreateMutable(
kCFAllocatorDefault, 5, &kCFTypeDictionaryKeyCallBacks, kCFAllocatorDefault, 5, &kCFTypeDictionaryKeyCallBacks,
&kCFTypeDictionaryValueCallBacks); &kCFTypeDictionaryValueCallBacks);
CFDictionarySetValue( notificationInfo, GROWL_NOTIFICATION_NAME, p_sys->notification_type ); CFDictionarySetValue( notificationInfo, GROWL_NOTIFICATION_NAME, p_sys->notification_type );
CFDictionarySetValue( notificationInfo, GROWL_APP_NAME, p_sys->app_name ); CFDictionarySetValue( notificationInfo, GROWL_APP_NAME, p_sys->app_name );
CFDictionarySetValue( notificationInfo, GROWL_NOTIFICATION_TITLE, title ); CFDictionarySetValue( notificationInfo, GROWL_NOTIFICATION_TITLE, title );
CFDictionarySetValue( notificationInfo, GROWL_NOTIFICATION_DESCRIPTION, desc ); CFDictionarySetValue( notificationInfo, GROWL_NOTIFICATION_DESCRIPTION, desc );
CFDictionarySetValue( notificationInfo, GROWL_NOTIFICATION_ICON, CFDictionarySetValue( notificationInfo, GROWL_NOTIFICATION_ICON,
art ? art : p_sys->default_icon ); art ? art : p_sys->default_icon );
CFRelease( title ); CFRelease( title );
CFRelease( desc ); CFRelease( desc );
CFNotificationCenterPostNotificationWithOptions( CFNotificationCenterPostNotificationWithOptions(
CFNotificationCenterGetDistributedCenter(), CFNotificationCenterGetDistributedCenter(),
(CFStringRef)GROWL_NOTIFICATION, NULL, notificationInfo, (CFStringRef)GROWL_NOTIFICATION, NULL, notificationInfo,
kCFNotificationPostToAllSessions ); kCFNotificationPostToAllSessions );
CFRelease( notificationInfo ); CFRelease( notificationInfo );
} }
/* Ripped from CFGrowlAdditions.c /* Ripped from CFGrowlAdditions.c
* Strangely, this function does exist in Growl shared library, but is not * Strangely, this function does exist in Growl shared library, but is not
* defined in public header files */ * defined in public header files */
static CFDataRef readFile(const char *filename) static CFDataRef readFile(const char *filename)
...@@ -342,7 +342,7 @@ static CFDataRef readFile(const char *filename) ...@@ -342,7 +342,7 @@ static CFDataRef readFile(const char *filename)
FILE *fp = fopen(filename, "r"); FILE *fp = fopen(filename, "r");
if( !fp ) if( !fp )
return NULL; return NULL;
fseek(fp, 0, SEEK_END); fseek(fp, 0, SEEK_END);
long dataLength = ftell(fp); long dataLength = ftell(fp);
fseek(fp, 0, SEEK_SET); fseek(fp, 0, SEEK_SET);
......
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