X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Faudioscrobbler.c;h=9b18f1d337760d317efd7ec1dbfd04eb8bb8c229;hb=63ffc8e1218d553842ba80e577b6110bd2d4e48d;hp=d3b4467885cafb941b98b5cac9e3a479e5cfaf8c;hpb=91d170a11d8c8cd9880c2982102797e67f349814;p=vlc diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c index d3b4467885..9b18f1d337 100644 --- a/modules/misc/audioscrobbler.c +++ b/modules/misc/audioscrobbler.c @@ -1,10 +1,11 @@ /***************************************************************************** * audioscrobbler.c : audioscrobbler submission plugin ***************************************************************************** - * Copyright (C) 2006-2007 the VideoLAN team + * Copyright © 2006-2009 the VideoLAN team * $Id$ * * Author: Rafaël Carré + * Ilkka Ollakka * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,30 +26,37 @@ * http://www.audioscrobbler.net/development/protocol/ * * TODO: "Now Playing" feature (not mandatory) + * Update to new API? http://www.lastfm.fr/api */ /***************************************************************************** * Preamble *****************************************************************************/ -#if defined( WIN32 ) -#include +#if defined( WIN32 ) +#include +#endif + +#ifdef HAVE_CONFIG_H +# include "config.h" #endif -#include +#include +#include #include +#include #include #include -#include #include #include #include -#include #include /***************************************************************************** * Local prototypes *****************************************************************************/ +#define QUEUE_MAX 50 + /* Keeps track of metadata to be submitted */ typedef struct audioscrobbler_song_t { @@ -59,17 +67,19 @@ typedef struct audioscrobbler_song_t int i_l; /**< track length */ char *psz_m; /**< musicbrainz id */ time_t date; /**< date since epoch */ + mtime_t i_start; /**< playing start */ } audioscrobbler_song_t; struct intf_sys_t { - audioscrobbler_song_t p_queue[50]; /**< songs not submitted yet*/ + audioscrobbler_song_t p_queue[QUEUE_MAX]; /**< songs not submitted yet*/ int i_songs; /**< number of songs */ vlc_mutex_t lock; /**< p_sys mutex */ + vlc_cond_t wait; /**< song to submit event */ /* data about audioscrobbler session */ - time_t next_exchange; /**< when can we send data */ + mtime_t next_exchange; /**< when can we send data */ unsigned int i_interval; /**< waiting interval (secs)*/ /* submission of played songs */ @@ -83,27 +93,26 @@ struct intf_sys_t int i_nowp_port; /**< port to which submit */ char *psz_nowp_file; /**< file to which submit */ #endif - vlc_bool_t b_handshaked; /**< are we authenticated ? */ + bool b_handshaked; /**< are we authenticated ? */ char psz_auth_token[33]; /**< Authentication token */ /* data about song currently playing */ audioscrobbler_song_t p_current_song; /**< song being played */ - time_t time_pause; /**< time when vlc paused */ - time_t time_total_pauses; /**< total time in pause */ + mtime_t time_pause; /**< time when vlc paused */ + mtime_t time_total_pauses; /**< total time in pause */ - vlc_bool_t b_submit; /**< do we have to submit ? */ + bool b_submit; /**< do we have to submit ? */ - vlc_bool_t b_state_cb; /**< if we registered the + bool b_state_cb; /**< if we registered the * "state" callback */ - vlc_bool_t b_meta_read; /**< if we read the song's + bool b_meta_read; /**< if we read the song's * metadata already */ }; 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, @@ -111,12 +120,12 @@ static int ItemChange ( vlc_object_t *, const char *, vlc_value_t, static int PlayingChange ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ); -static int AddToQueue ( intf_thread_t * ); +static void AddToQueue ( intf_thread_t * ); static int Handshake ( intf_thread_t * ); static int ReadMetaData ( intf_thread_t * ); static void DeleteSong ( audioscrobbler_song_t* ); static int ParseURL ( char *, char **, char **, int * ); -static void HandleInterval ( time_t *, unsigned int * ); +static void HandleInterval ( mtime_t *, unsigned int * ); /***************************************************************************** * Module descriptor @@ -126,6 +135,8 @@ static void HandleInterval ( time_t *, unsigned int * ); #define USERNAME_LONGTEXT N_("The username of your last.fm account") #define PASSWORD_TEXT N_("Password") #define PASSWORD_LONGTEXT N_("The password of your last.fm account") +#define URL_TEXT N_("Scrobbler URL") +#define URL_LONGTEXT N_("The URL set for an alternative scrobbler engine") /* This error value is used when last.fm plugin has to be unloaded. */ #define VLC_AUDIOSCROBBLER_EFATAL -69 @@ -141,30 +152,31 @@ static void HandleInterval ( time_t *, unsigned int * ); "Connection: close\n" \ "Content-type: application/x-www-form-urlencoded\n" \ "Host: %s\n" \ - "User-agent: VLC Media Player/%s\r\n" \ + "User-agent: VLC media player/%s\r\n" \ "\r\n" \ "%s\r\n" \ "\r\n" -vlc_module_begin(); - set_category( CAT_INTERFACE ); - set_subcategory( SUBCAT_INTERFACE_CONTROL ); - set_shortname( N_( "Audioscrobbler" ) ); - set_description( N_("Submission of played songs to last.fm") ); +vlc_module_begin () + set_category( CAT_INTERFACE ) + set_subcategory( SUBCAT_INTERFACE_CONTROL ) + set_shortname( N_( "Audioscrobbler" ) ) + set_description( N_("Submission of played songs to last.fm") ) add_string( "lastfm-username", "", NULL, - USERNAME_TEXT, USERNAME_LONGTEXT, VLC_FALSE ); + USERNAME_TEXT, USERNAME_LONGTEXT, false ) add_password( "lastfm-password", "", NULL, - PASSWORD_TEXT, PASSWORD_LONGTEXT, VLC_FALSE ); - set_capability( "interface", 0 ); - set_callbacks( Open, Close ); -vlc_module_end(); + PASSWORD_TEXT, PASSWORD_LONGTEXT, false ) + add_string( "scrobbler-url", "post.audioscrobbler.com", NULL, + URL_TEXT, URL_LONGTEXT, false ) + set_capability( "interface", 0 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Open: initialize and create stuff *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - playlist_t *p_playlist; intf_thread_t *p_intf = ( intf_thread_t* ) p_this; intf_sys_t *p_sys = calloc( 1, sizeof( intf_sys_t ) ); @@ -173,13 +185,10 @@ static int Open( vlc_object_t *p_this ) p_intf->p_sys = p_sys; - vlc_mutex_init( p_this, &p_sys->lock ); + vlc_mutex_init( &p_sys->lock ); + vlc_cond_init( &p_sys->wait ); - p_playlist = pl_Yield( p_intf ); - PL_LOCK; - var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf ); - PL_UNLOCK; - pl_Release( p_playlist ); + var_AddCallback( pl_Get( p_intf ), "item-current", ItemChange, p_intf ); p_intf->pf_run = Run; @@ -191,33 +200,21 @@ static int Open( vlc_object_t *p_this ) *****************************************************************************/ static void Close( vlc_object_t *p_this ) { - playlist_t *p_playlist; + playlist_t *p_playlist = pl_Get( p_this ); input_thread_t *p_input; intf_thread_t *p_intf = ( intf_thread_t* ) p_this; intf_sys_t *p_sys = p_intf->p_sys; - p_playlist = pl_Yield( p_intf ); - PL_LOCK; + var_DelCallback( p_playlist, "item-current", ItemChange, p_intf ); - var_DelCallback( p_playlist, "playlist-current", ItemChange, p_intf ); - - p_input = p_playlist->p_input; + p_input = playlist_CurrentInput( p_playlist ); if ( p_input ) { - vlc_object_yield( p_input ); - if( p_sys->b_state_cb ) - var_DelCallback( p_input, "state", PlayingChange, p_intf ); - + var_DelCallback( p_input, "intf-event", PlayingChange, p_intf ); vlc_object_release( p_input ); } - PL_UNLOCK; - pl_Release( p_playlist ); - - p_intf->b_dead = VLC_TRUE; - /* we lock the mutex in case p_sys is being accessed from a callback */ - vlc_mutex_lock ( &p_sys->lock ); int i; for( i = 0; i < p_sys->i_songs; i++ ) DeleteSong( &p_sys->p_queue[i] ); @@ -227,25 +224,12 @@ static void Close( vlc_object_t *p_this ) free( p_sys->psz_nowp_host ); free( p_sys->psz_nowp_file ); #endif - vlc_mutex_unlock ( &p_sys->lock ); + vlc_cond_destroy( &p_sys->wait ); vlc_mutex_destroy( &p_sys->lock ); free( p_sys ); } -/***************************************************************************** - * 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_destroy( p_this ); -} - /***************************************************************************** * Run : call Handshake() then submit songs *****************************************************************************/ @@ -257,65 +241,63 @@ static void Run( intf_thread_t *p_intf ) uint8_t p_buffer[1024]; char *p_buffer_pos; int i_post_socket; - vlc_bool_t b_die; + int canc = vlc_savecancel(); intf_sys_t *p_sys = p_intf->p_sys; /* main loop */ - while( !p_intf->b_die && !p_intf->p_libvlc->b_die ) + for( ;; ) { - /* waiting for data to submit, if waiting interval is elapsed */ - vlc_object_lock( p_intf ); - if( time( NULL ) < p_sys->next_exchange ) - { - mtime_t deadline = (mtime_t)p_sys->next_exchange * (mtime_t)1000000; - b_die = ( vlc_object_timedwait( p_intf, deadline) < 0 ); - } + bool b_wait = false; + + + vlc_restorecancel( canc ); + vlc_mutex_lock( &p_sys->lock ); + mutex_cleanup_push( &p_sys->lock ); + + if( mdate() < p_sys->next_exchange ) + /* wait until we can resubmit, i.e. */ + b_wait = vlc_cond_timedwait( &p_sys->wait, &p_sys->lock, + p_sys->next_exchange ) == 0; else - b_die = vlc_object_wait( p_intf ); - vlc_object_unlock( p_intf ); + /* wait for data to submit */ + /* we are signaled each time there is a song to submit */ + vlc_cond_wait( &p_sys->wait, &p_sys->lock ); + vlc_cleanup_run(); + canc = vlc_savecancel(); - if( b_die ) - { - msg_Dbg( p_intf, "audioscrobbler is dying"); - return; - } - /* we are signaled each time there is a song to submit */ - else if( time( NULL ) < p_sys->next_exchange ) - continue; + if( b_wait ) + continue; /* holding on until next_exchange */ /* handshake if needed */ - if( p_sys->b_handshaked == VLC_FALSE ) + if( p_sys->b_handshaked == false ) { msg_Dbg( p_intf, "Handshaking with last.fm ..." ); switch( Handshake( p_intf ) ) { case VLC_ENOMEM: - Unload( p_intf ); return; case VLC_ENOVAR: /* username not set */ - intf_UserFatal( p_intf, VLC_FALSE, + dialog_Fatal( p_intf, _("Last.fm username not set"), - _("Please set a username or disable the " + "%s", _("Please set a username or disable the " "audioscrobbler plugin, and restart VLC.\n" "Visit http://www.last.fm/join/ to get an account.") ); - Unload( p_intf ); return; case VLC_SUCCESS: msg_Dbg( p_intf, "Handshake successfull :)" ); - p_sys->b_handshaked = VLC_TRUE; + p_sys->b_handshaked = true; p_sys->i_interval = 0; - time( &p_sys->next_exchange ); + p_sys->next_exchange = mdate(); break; case VLC_AUDIOSCROBBLER_EFATAL: - msg_Warn( p_intf, "Unloading..." ); - Unload( p_intf ); + msg_Warn( p_intf, "Exiting..." ); return; case VLC_EGENERIC: @@ -325,15 +307,19 @@ static void Run( intf_thread_t *p_intf ) break; } /* if handshake failed let's restart the loop */ - if( p_sys->b_handshaked == VLC_FALSE ) + if( p_sys->b_handshaked == false ) continue; } msg_Dbg( p_intf, "Going to submit some data..." ); + /* The session may be invalid if there is a trailing \n */ + char *psz_ln = strrchr( p_sys->psz_auth_token, '\n' ); + if( psz_ln ) + *psz_ln = '\0'; + if( !asprintf( &psz_submit, "s=%s", p_sys->psz_auth_token ) ) { /* Out of memory */ - Unload( p_intf ); return; } @@ -344,18 +330,27 @@ static void Run( intf_thread_t *p_intf ) { 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=" - "&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, - i_song, (uintmax_t)p_song->date, i_song, i_song, - i_song, p_song->i_l, i_song, p_song->psz_b, - i_song, p_song->psz_n, i_song, p_song->psz_m + "&a%%5B%d%%5D=%s" + "&t%%5B%d%%5D=%s" + "&i%%5B%d%%5D=%u" + "&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, + i_song, (unsigned)p_song->date, /* HACK: %ju (uintmax_t) unsupported on Windows */ + i_song, + i_song, + i_song, p_song->i_l, + i_song, p_song->psz_b, + i_song, p_song->psz_n, + i_song, p_song->psz_m ) ) { /* Out of memory */ vlc_mutex_unlock( &p_sys->lock ); - Unload( p_intf ); return; } psz_submit_tmp = psz_submit; @@ -365,7 +360,6 @@ static void Run( intf_thread_t *p_intf ) free( psz_submit_tmp ); free( psz_submit_song ); vlc_mutex_unlock( &p_sys->lock ); - Unload( p_intf ); return; } free( psz_submit_song ); @@ -380,16 +374,16 @@ static void Run( intf_thread_t *p_intf ) { /* If connection fails, we assume we must handshake again */ HandleInterval( &p_sys->next_exchange, &p_sys->i_interval ); - p_sys->b_handshaked = VLC_FALSE; + p_sys->b_handshaked = false; free( psz_submit ); continue; } /* we transmit the data */ i_net_ret = net_Printf( - VLC_OBJECT( p_intf ), i_post_socket, NULL, + p_intf, i_post_socket, NULL, POST_REQUEST, p_sys->psz_submit_file, - (unsigned)strlen( psz_submit ), p_sys->psz_submit_file, + (unsigned)strlen( psz_submit ), p_sys->psz_submit_host, VERSION, psz_submit ); @@ -398,12 +392,12 @@ static void Run( intf_thread_t *p_intf ) { /* If connection fails, we assume we must handshake again */ HandleInterval( &p_sys->next_exchange, &p_sys->i_interval ); - p_sys->b_handshaked = VLC_FALSE; + p_sys->b_handshaked = false; continue; } i_net_ret = net_Read( p_intf, i_post_socket, NULL, - p_buffer, 1023, VLC_FALSE ); + p_buffer, 1023, false ); if ( i_net_ret <= 0 ) { /* if we get no answer, something went wrong : try again */ @@ -424,8 +418,8 @@ static void Run( intf_thread_t *p_intf ) p_buffer_pos = strstr( ( char * ) p_buffer, "BADSESSION" ); if ( p_buffer_pos ) { - msg_Dbg( p_intf, "Authentication failed (BADSESSION), are you connected to last.fm with another program ?" ); - p_sys->b_handshaked = VLC_FALSE; + msg_Err( p_intf, "Authentication failed (BADSESSION), are you connected to last.fm with another program ?" ); + p_sys->b_handshaked = false; HandleInterval( &p_sys->next_exchange, &p_sys->i_interval ); continue; } @@ -438,18 +432,19 @@ static void Run( intf_thread_t *p_intf ) DeleteSong( &p_sys->p_queue[i] ); p_sys->i_songs = 0; p_sys->i_interval = 0; - time( &p_sys->next_exchange ); + p_sys->next_exchange = mdate(); msg_Dbg( p_intf, "Submission successful!" ); } else { - msg_Dbg( p_intf, "Authentication failed, handshaking again (%s)", + msg_Err( p_intf, "Authentication failed, handshaking again (%s)", p_buffer ); - p_sys->b_handshaked = VLC_FALSE; + p_sys->b_handshaked = false; HandleInterval( &p_sys->next_exchange, &p_sys->i_interval ); continue; } } + vlc_restorecancel( canc ); } /***************************************************************************** @@ -458,27 +453,44 @@ static void Run( intf_thread_t *p_intf ) static int PlayingChange( vlc_object_t *p_this, const char *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED( oldval ); + intf_thread_t *p_intf = ( intf_thread_t* ) p_data; intf_sys_t *p_sys = p_intf->p_sys; + input_thread_t *p_input = ( input_thread_t* )p_this; + vlc_value_t state_value; VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); - if( p_intf->b_dead ) + if( newval.i_int != INPUT_EVENT_STATE ) return VLC_SUCCESS; + + if( var_CountChoices( p_input, "video-es" ) ) + { + msg_Dbg( p_this, "Not an audio-only input, not submitting"); return VLC_SUCCESS; + } + + state_value.i_int = 0; + + var_Get( p_input, "state", &state_value ); + - if( p_sys->b_meta_read == VLC_FALSE && newval.i_int == PLAYING_S ) + if( p_sys->b_meta_read == false && state_value.i_int >= PLAYING_S ) + { ReadMetaData( p_intf ); + return VLC_SUCCESS; + } - if( newval.i_int == END_S || newval.i_int == ERROR_S ) + + if( state_value.i_int >= END_S ) + AddToQueue( p_intf ); + else if( state_value.i_int == PAUSE_S ) + p_sys->time_pause = mdate(); + else if( p_sys->time_pause > 0 && state_value.i_int == PLAYING_S ) { - /* We'll try to add the previously playing song in the queue */ - if( AddToQueue( p_intf ) == VLC_ENOMEM ) - return VLC_ENOMEM; + p_sys->time_total_pauses += ( mdate() - p_sys->time_pause ); + p_sys->time_pause = 0; } - else if( oldval.i_int == PLAYING_S && newval.i_int == PAUSE_S ) - time( &p_sys->time_pause ); - else if( oldval.i_int == PAUSE_S && newval.i_int == PLAYING_S ) - p_sys->time_total_pauses += time( NULL ) - p_sys->time_pause; return VLC_SUCCESS; } @@ -489,37 +501,22 @@ static int PlayingChange( vlc_object_t *p_this, const char *psz_var, static int ItemChange( vlc_object_t *p_this, const char *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - playlist_t *p_playlist; input_thread_t *p_input; intf_thread_t *p_intf = ( intf_thread_t* ) p_data; intf_sys_t *p_sys = p_intf->p_sys; input_item_t *p_item; - vlc_value_t video_val; VLC_UNUSED( p_this ); VLC_UNUSED( psz_var ); VLC_UNUSED( oldval ); VLC_UNUSED( newval ); - if( p_intf->b_dead ) - return VLC_SUCCESS; - - p_sys->b_state_cb = VLC_FALSE; - p_sys->b_meta_read = VLC_FALSE; - p_sys->b_submit = VLC_FALSE; + p_sys->b_state_cb = false; + p_sys->b_meta_read = false; + p_sys->b_submit = false; - p_playlist = pl_Yield( p_intf ); - PL_LOCK; - p_input = p_playlist->p_input; + p_input = playlist_CurrentInput( pl_Get( p_intf ) ); if( !p_input || p_input->b_dead ) - { - PL_UNLOCK; - pl_Release( p_playlist ); return VLC_SUCCESS; - } - - vlc_object_yield( p_input ); - PL_UNLOCK; - pl_Release( p_playlist ); p_item = input_GetItem( p_input ); if( !p_item ) @@ -528,19 +525,19 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, return VLC_SUCCESS; } - var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &video_val, NULL ); - if( ( video_val.i_int > 0 ) || p_item->i_type == ITEM_TYPE_NET ) + if( var_CountChoices( p_input, "video-es" ) ) { - msg_Dbg( p_this, "Not an audio local file, not submitting"); + msg_Dbg( p_this, "Not an audio-only input, not submitting"); vlc_object_release( p_input ); return VLC_SUCCESS; } p_sys->time_total_pauses = 0; - time( &p_sys->p_current_song.date ); + time( &p_sys->p_current_song.date ); /* to be sent to last.fm */ + p_sys->p_current_song.i_start = mdate(); /* only used locally */ - var_AddCallback( p_input, "state", PlayingChange, p_intf ); - p_sys->b_state_cb = VLC_TRUE; + var_AddCallback( p_input, "intf-event", PlayingChange, p_intf ); + p_sys->b_state_cb = true; if( input_item_IsPreparsed( p_item ) ) ReadMetaData( p_intf ); @@ -554,55 +551,52 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var, /***************************************************************************** * AddToQueue: Add the played song to the queue to be submitted *****************************************************************************/ -static int AddToQueue ( intf_thread_t *p_this ) +static void AddToQueue ( intf_thread_t *p_this ) { - time_t played_time; + mtime_t played_time; intf_sys_t *p_sys = p_this->p_sys; vlc_mutex_lock( &p_sys->lock ); if( !p_sys->b_submit ) + goto end; + + /* wait for the user to listen enough before submitting */ + played_time = mdate() - p_sys->p_current_song.i_start - + p_sys->time_total_pauses; + played_time /= 1000000; /* µs → s */ + + /*HACK: it seam that the preparsing sometime fail, + so use the playing time as the song length */ + if( p_sys->p_current_song.i_l == 0 ) + p_sys->p_current_song.i_l = played_time; + + /* Don't send song shorter than 30s */ + if( p_sys->p_current_song.i_l < 30 ) { - DeleteSong( &p_sys->p_current_song ); - vlc_mutex_unlock( &p_sys->lock ); - return VLC_SUCCESS; + msg_Dbg( p_this, "Song too short (< 30s), not submitting" ); + goto end; } - /* wait for the user to listen enough before submitting */ - time ( &played_time ); - played_time -= p_sys->p_current_song.date; - played_time -= p_sys->time_total_pauses; + /* Send if the user had listen more than 240s OR half the track length */ if( ( played_time < 240 ) && ( played_time < ( p_sys->p_current_song.i_l / 2 ) ) ) { msg_Dbg( p_this, "Song not listened long enough, not submitting" ); - DeleteSong( &p_sys->p_current_song ); - vlc_mutex_unlock( &p_sys->lock ); - return VLC_SUCCESS; - } - - if( p_sys->p_current_song.i_l < 30 ) - { - msg_Dbg( p_this, "Song too short (< 30s), not submitting" ); - DeleteSong( &p_sys->p_current_song ); - vlc_mutex_unlock( &p_sys->lock ); - return VLC_SUCCESS; + goto end; } + /* Check that all meta are present */ if( !p_sys->p_current_song.psz_a || !*p_sys->p_current_song.psz_a || !p_sys->p_current_song.psz_t || !*p_sys->p_current_song.psz_t ) { msg_Dbg( p_this, "Missing artist or title, not submitting" ); - DeleteSong( &p_sys->p_current_song ); - vlc_mutex_unlock( &p_sys->lock ); - return VLC_SUCCESS; + goto end; } - if( p_sys->i_songs == 50 ) + if( p_sys->i_songs >= QUEUE_MAX ) { msg_Warn( p_this, "Submission queue is full, not submitting" ); - DeleteSong( &p_sys->p_current_song ); - vlc_mutex_unlock( &p_sys->lock ); - return VLC_SUCCESS; + goto end; } msg_Dbg( p_this, "Song will be submitted." ); @@ -627,12 +621,12 @@ static int AddToQueue ( intf_thread_t *p_this ) p_sys->i_songs++; /* signal the main loop we have something to submit */ - vlc_object_lock( p_this ); - vlc_cond_signal( &p_this->object_wait ); - vlc_object_unlock( p_this ); + vlc_cond_signal( &p_sys->wait ); +end: + DeleteSong( &p_sys->p_current_song ); + p_sys->b_submit = false; vlc_mutex_unlock( &p_sys->lock ); - return VLC_SUCCESS; } /***************************************************************************** @@ -654,26 +648,34 @@ static int ParseURL( char *psz_url, char **psz_host, char **psz_file, { int i_pos; int i_len = strlen( psz_url ); + bool b_no_port = false; FREENULL( *psz_host ); FREENULL( *psz_file ); i_pos = strcspn( psz_url, ":" ); if( i_pos == i_len ) - return VLC_EGENERIC; + { + *i_port = 80; + i_pos = strcspn( psz_url, "/" ); + b_no_port = true; + } *psz_host = strndup( psz_url, i_pos ); if( !*psz_host ) return VLC_ENOMEM; - i_pos++; /* skip the ':' */ - *i_port = atoi( psz_url + i_pos ); - if( *i_port <= 0 ) + if( !b_no_port ) { - FREENULL( *psz_host ); - return VLC_EGENERIC; - } + i_pos++; /* skip the ':' */ + *i_port = atoi( psz_url + i_pos ); + if( *i_port <= 0 ) + { + FREENULL( *psz_host ); + return VLC_EGENERIC; + } - i_pos = strcspn( psz_url, "/" ); + i_pos = strcspn( psz_url, "/" ); + } if( i_pos == i_len ) return VLC_EGENERIC; @@ -696,8 +698,9 @@ static int ParseURL( char *psz_url, char **psz_host, char **psz_file, static int Handshake( intf_thread_t *p_this ) { char *psz_username, *psz_password; + char *psz_scrobbler_url; time_t timestamp; - char psz_timestamp[33]; + char psz_timestamp[21]; struct md5_s p_struct_md5; @@ -712,11 +715,11 @@ static int Handshake( intf_thread_t *p_this ) intf_thread_t *p_intf = ( intf_thread_t* ) p_this; intf_sys_t *p_sys = p_this->p_sys; - psz_username = config_GetPsz( p_this, "lastfm-username" ); + psz_username = var_InheritString( p_this, "lastfm-username" ); if( !psz_username ) return VLC_ENOMEM; - psz_password = config_GetPsz( p_this, "lastfm-password" ); + psz_password = var_InheritString( p_this, "lastfm-password" ); if( !psz_password ) { free( psz_username ); @@ -747,7 +750,8 @@ static int Handshake( intf_thread_t *p_this ) 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 @@ -765,17 +769,26 @@ static int Handshake( intf_thread_t *p_this ) free( psz_username ); return VLC_ENOMEM; } - strncpy( &p_sys->psz_auth_token[0], psz_auth_token, 33 ); + strncpy( p_sys->psz_auth_token, psz_auth_token, 33 ); free( psz_auth_token ); + psz_scrobbler_url = var_InheritString( p_this, "scrobbler-url" ); + if( !psz_scrobbler_url ) + { + free( psz_username ); + return VLC_ENOMEM; + } + if( !asprintf( &psz_handshake_url, - "http://post.audioscrobbler.com/?hs=true&p=1.2&c=%s&v=%s&u=%s&t=%s&a=%s", + "http://%s/?hs=true&p=1.2&c=%s&v=%s&u=%s&t=%s&a=%s", psz_scrobbler_url, CLIENT_NAME, CLIENT_VERSION, psz_username, psz_timestamp, p_sys->psz_auth_token ) ) { + free( psz_scrobbler_url ); free( psz_username ); return VLC_ENOMEM; } + free( psz_scrobbler_url ); free( psz_username ); /* send the http handshake request */ @@ -799,7 +812,7 @@ static int Handshake( intf_thread_t *p_this ) if ( p_buffer_pos ) { /* handshake request failed, sorry */ - msg_Warn( p_this, "last.fm handshake failed: %s", p_buffer_pos + 7 ); + msg_Err( p_this, "last.fm handshake failed: %s", p_buffer_pos + 7 ); return VLC_EGENERIC; } @@ -807,9 +820,9 @@ static int Handshake( intf_thread_t *p_this ) if ( p_buffer_pos ) { /* authentication failed, bad username/password combination */ - intf_UserFatal( p_this, VLC_FALSE, + dialog_Fatal( p_this, _("last.fm: Authentication failed"), - _("last.fm username or password is incorrect. " + "%s", _("last.fm username or password is incorrect. " "Please verify your settings and relaunch VLC." ) ); return VLC_AUDIOSCROBBLER_EFATAL; } @@ -842,7 +855,7 @@ static int Handshake( intf_thread_t *p_this ) p_buffer_pos++; /* we skip the '\n' */ /* save the session ID */ - snprintf( &p_sys->psz_auth_token[0], 33, "%s", p_buffer_pos ); + snprintf( p_sys->psz_auth_token, 33, "%s", p_buffer_pos ); p_buffer_pos = strstr( p_buffer_pos, "http://" ); if( !p_buffer_pos || strlen( p_buffer_pos ) == 7 ) @@ -895,7 +908,7 @@ oom: return VLC_ENOMEM; proto: - msg_Warn( p_intf, "Handshake: can't recognize server protocol" ); + msg_Err( p_intf, "Handshake: can't recognize server protocol" ); return VLC_EGENERIC; } @@ -916,25 +929,14 @@ static void DeleteSong( audioscrobbler_song_t* p_song ) *****************************************************************************/ static int ReadMetaData( intf_thread_t *p_this ) { - playlist_t *p_playlist; input_thread_t *p_input; input_item_t *p_item; intf_sys_t *p_sys = p_this->p_sys; - p_playlist = pl_Yield( p_this ); - PL_LOCK; - p_input = p_playlist->p_input; + p_input = playlist_CurrentInput( pl_Get( p_this ) ); if( !p_input ) - { - PL_UNLOCK; - pl_Release( p_playlist ); return( VLC_SUCCESS ); - } - - vlc_object_yield( p_input ); - PL_UNLOCK; - pl_Release( p_playlist ); p_item = input_GetItem( p_input ); if( !p_item ) @@ -948,15 +950,16 @@ static int ReadMetaData( intf_thread_t *p_this ) a = encode_URI_component( psz_meta ); \ if( !a ) \ { \ + vlc_mutex_unlock( &p_sys->lock ); \ + vlc_object_release( p_input ); \ free( psz_meta ); \ return VLC_ENOMEM; \ } \ - free( psz_meta ); \ } vlc_mutex_lock( &p_sys->lock ); - p_sys->b_meta_read = VLC_TRUE; + p_sys->b_meta_read = true; ALLOC_ITEM_META( p_sys->p_current_song.psz_a, Artist ) else @@ -967,6 +970,7 @@ static int ReadMetaData( intf_thread_t *p_this ) free( psz_meta ); return VLC_EGENERIC; } + free( psz_meta ); ALLOC_ITEM_META( p_sys->p_current_song.psz_t, Title ) else @@ -978,23 +982,27 @@ static int ReadMetaData( intf_thread_t *p_this ) 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 = VLC_TRUE; + 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" ); @@ -1005,20 +1013,20 @@ static int ReadMetaData( intf_thread_t *p_this ) } -static void HandleInterval( time_t *next, unsigned int *i_interval ) +static void HandleInterval( mtime_t *next, unsigned int *i_interval ) { if( *i_interval == 0 ) { /* first interval is 1 minute */ - *i_interval = 60; + *i_interval = 1; } else { /* else we double the previous interval, up to 120 minutes */ - *i_interval = *i_interval * 2; - if( *i_interval > 60*120 ) - *i_interval = 60*120; + *i_interval <<= 1; + if( *i_interval > 120 ) + *i_interval = 120; } - *next = time( NULL ) + *i_interval; + *next = mdate() + ( *i_interval * 1000000 * 60 ); }