# 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>
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
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 */
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 */
};
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 );
+ PASSWORD_TEXT, PASSWORD_LONGTEXT, false );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
vlc_module_end();
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;
}
PL_UNLOCK;
- pl_Release( p_playlist );
+ pl_Release( p_intf );
- p_intf->b_dead = VLC_TRUE;
+ p_intf->b_dead = true;
/* we lock the mutex in case p_sys is being accessed from a callback */
vlc_mutex_lock ( &p_sys->lock );
int i;
/* main loop */
for( ;; )
{
- vlc_bool_t b_die = VLC_FALSE, b_wait = VLC_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 */
/* handshake if needed */
- if( p_sys->b_handshaked == VLC_FALSE )
+ if( p_sys->b_handshaked == false )
{
msg_Dbg( p_intf, "Handshaking with last.fm ..." );
case VLC_ENOVAR:
/* username not set */
- intf_UserFatal( p_intf, VLC_FALSE,
+ intf_UserFatal( p_intf, false,
_("Last.fm username not set"),
_("Please set a username or disable the "
"audioscrobbler plugin, and restart VLC.\n"
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;
p_sys->next_exchange = mdate();
break;
break;
}
/* if handshake failed let's restart the loop */
- if( p_sys->b_handshaked == VLC_FALSE )
+ if( p_sys->b_handshaked == false )
continue;
}
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,
{
/* 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;
}
{
/* 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 */
if ( p_buffer_pos )
{
msg_Err( p_intf, "Authentication failed (BADSESSION), are you connected to last.fm with another program ?" );
- p_sys->b_handshaked = VLC_FALSE;
+ p_sys->b_handshaked = false;
HandleInterval( &p_sys->next_exchange, &p_sys->i_interval );
continue;
}
{
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;
}
if( p_intf->b_dead )
return VLC_SUCCESS;
- if( p_sys->b_meta_read == VLC_FALSE && newval.i_int >= PLAYING_S )
+ if( p_sys->b_meta_read == false && newval.i_int >= PLAYING_S )
{
ReadMetaData( p_intf );
return VLC_SUCCESS;
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;
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 )
}
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;
+ p_sys->b_state_cb = true;
if( input_item_IsPreparsed( p_item ) )
ReadMetaData( p_intf );
goto end;
/* wait for the user to listen enough before submitting */
- played_time = mdate();
- played_time -= p_sys->p_current_song.date;
- played_time -= p_sys->time_total_pauses;
+ played_time = mdate() - p_sys->p_current_song.i_start -
+ p_sys->time_total_pauses;
played_time /= 1000000; /* µs → s */
if( ( played_time < 240 ) &&
end:
DeleteSong( &p_sys->p_current_song );
- p_sys->b_submit = VLC_FALSE;
+ p_sys->b_submit = false;
vlc_mutex_unlock( &p_sys->lock );
}
{
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_buffer_pos )
{
/* authentication failed, bad username/password combination */
- intf_UserFatal( p_this, VLC_FALSE,
+ intf_UserFatal( p_this, false,
_("last.fm: Authentication failed"),
_("last.fm username or password is incorrect. "
"Please verify your settings and relaunch VLC." ) );
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 )
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
}
/* 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
projects / vlc / blobdiff