# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_meta.h>
#include <vlc_md5.h>
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-static void Unload ( intf_thread_t * );
static void Run ( intf_thread_t * );
static int ItemChange ( vlc_object_t *, const char *, vlc_value_t,
p_intf->p_sys = p_sys;
- vlc_mutex_init( p_this, &p_sys->lock );
+ vlc_mutex_init( &p_sys->lock );
p_playlist = pl_Yield( p_intf );
PL_LOCK;
var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
PL_UNLOCK;
- pl_Release( p_playlist );
+ pl_Release( p_intf );
p_intf->pf_run = Run;
intf_sys_t *p_sys = p_intf->p_sys;
p_playlist = pl_Yield( p_intf );
- PL_LOCK;
+ if( p_playlist )
+ {
+ PL_LOCK;
- var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
+ var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf );
- p_input = p_playlist->p_input;
- if ( p_input )
- {
- vlc_object_yield( p_input );
+ p_input = p_playlist->p_input;
+ if ( p_input )
+ {
+ vlc_object_yield( p_input );
- if( p_sys->b_state_cb )
- var_DelCallback( p_input, "state", PlayingChange, p_intf );
+ if( p_sys->b_state_cb )
+ var_DelCallback( p_input, "state", PlayingChange, p_intf );
- vlc_object_release( p_input );
- }
+ vlc_object_release( p_input );
+ }
- PL_UNLOCK;
- pl_Release( p_playlist );
+ PL_UNLOCK;
+ pl_Release( p_intf );
+ }
p_intf->b_dead = true;
/* we lock the mutex in case p_sys is being accessed from a callback */
}
-/*****************************************************************************
- * Unload: Unloads the audioscrobbler when encountering fatal errors
- *****************************************************************************/
-static void Unload( intf_thread_t *p_this )
-{
- vlc_object_kill( p_this );
- vlc_object_detach( p_this );
- if( p_this->p_module )
- module_Unneed( p_this, p_this->p_module );
- vlc_mutex_destroy( &p_this->change_lock );
- vlc_object_release( p_this );
-}
-
/*****************************************************************************
* Run : call Handshake() then submit songs
*****************************************************************************/
/* main loop */
for( ;; )
{
- bool b_die = false, b_wait = false;
+ bool b_wait = false;
vlc_object_lock( p_intf );
- if( vlc_object_alive( p_intf ) )
- {
- if( mdate() < p_sys->next_exchange )
- /* wait until we can resubmit, i.e. */
- b_wait = !vlc_object_timedwait( p_intf,
- p_sys->next_exchange );
- else
- /* wait for data to submit */
- /* we are signaled each time there is a song to submit */
- vlc_object_wait( p_intf );
- }
- b_die = !vlc_object_alive( p_intf );
- vlc_object_unlock( p_intf );
-
- if( b_die )
+ if( !vlc_object_alive( p_intf ) )
{
+ vlc_object_unlock( p_intf );
msg_Dbg( p_intf, "audioscrobbler is dying");
return;
}
+ if( mdate() < p_sys->next_exchange )
+ /* wait until we can resubmit, i.e. */
+ b_wait = vlc_object_timedwait( p_intf, p_sys->next_exchange ) == 0;
+ else
+ /* wait for data to submit */
+ /* we are signaled each time there is a song to submit */
+ vlc_object_wait( p_intf );
+ vlc_object_unlock( p_intf );
+
if( b_wait )
continue; /* holding on until next_exchange */
switch( Handshake( p_intf ) )
{
case VLC_ENOMEM:
- Unload( p_intf );
return;
case VLC_ENOVAR:
"audioscrobbler plugin, and restart VLC.\n"
"Visit http://www.last.fm/join/ to get an account.")
);
- Unload( p_intf );
return;
case VLC_SUCCESS:
break;
case VLC_AUDIOSCROBBLER_EFATAL:
- msg_Warn( p_intf, "Unloading..." );
- Unload( p_intf );
+ msg_Warn( p_intf, "Exiting..." );
return;
case VLC_EGENERIC:
if( !asprintf( &psz_submit, "s=%s", p_sys->psz_auth_token ) )
{ /* Out of memory */
- Unload( p_intf );
return;
}
p_song = &p_sys->p_queue[i_song];
if( !asprintf( &psz_submit_song,
"&a%%5B%d%%5D=%s&t%%5B%d%%5D=%s"
- "&i%%5B%d%%5D=%llu&o%%5B%d%%5D=P&r%%5B%d%%5D="
+ "&i%%5B%d%%5D=%ju&o%%5B%d%%5D=P&r%%5B%d%%5D="
"&l%%5B%d%%5D=%d&b%%5B%d%%5D=%s"
"&n%%5B%d%%5D=%s&m%%5B%d%%5D=%s",
i_song, p_song->psz_a, i_song, p_song->psz_t,
) )
{ /* Out of memory */
vlc_mutex_unlock( &p_sys->lock );
- Unload( p_intf );
return;
}
psz_submit_tmp = psz_submit;
free( psz_submit_tmp );
free( psz_submit_song );
vlc_mutex_unlock( &p_sys->lock );
- Unload( p_intf );
return;
}
free( psz_submit_song );
if( !p_input || p_input->b_dead )
{
PL_UNLOCK;
- pl_Release( p_playlist );
+ pl_Release( p_intf );
return VLC_SUCCESS;
}
vlc_object_yield( p_input );
PL_UNLOCK;
- pl_Release( p_playlist );
+ pl_Release( p_intf );
p_item = input_GetItem( p_input );
if( !p_item )
{
char *psz_username, *psz_password;
time_t timestamp;
- char psz_timestamp[33];
+ char psz_timestamp[21];
struct md5_s p_struct_md5;
return VLC_ENOMEM;
}
- snprintf( psz_timestamp, 33, "%llu", (uintmax_t)timestamp );
+ snprintf( psz_timestamp, sizeof( psz_timestamp ), "%"PRIu64,
+ (uint64_t)timestamp );
/* generates a md5 hash of :
* - md5 hash of the password, plus
if( !p_input )
{
PL_UNLOCK;
- pl_Release( p_playlist );
+ pl_Release( p_this );
return( VLC_SUCCESS );
}
vlc_object_yield( p_input );
PL_UNLOCK;
- pl_Release( p_playlist );
+ pl_Release( p_this );
p_item = input_GetItem( p_input );
if( !p_item )
free( psz_meta ); \
return VLC_ENOMEM; \
} \
- free( psz_meta ); \
}
vlc_mutex_lock( &p_sys->lock );
free( psz_meta );
return VLC_EGENERIC;
}
+ free( psz_meta );
ALLOC_ITEM_META( p_sys->p_current_song.psz_t, Title )
else
free( psz_meta );
return VLC_EGENERIC;
}
+ free( psz_meta );
/* Now we have read the mandatory meta data, so we can submit that info */
p_sys->b_submit = true;
ALLOC_ITEM_META( p_sys->p_current_song.psz_b, Album )
else
p_sys->p_current_song.psz_b = calloc( 1, 1 );
+ free( psz_meta );
ALLOC_ITEM_META( p_sys->p_current_song.psz_m, TrackID )
else
p_sys->p_current_song.psz_m = calloc( 1, 1 );
+ free( psz_meta );
p_sys->p_current_song.i_l = input_item_GetDuration( p_item ) / 1000000;
ALLOC_ITEM_META( p_sys->p_current_song.psz_n, TrackNum )
else
p_sys->p_current_song.psz_n = calloc( 1, 1 );
+ free( psz_meta );
#undef ALLOC_ITEM_META
msg_Dbg( p_this, "Meta data registered" );
projects / vlc / blobdiff