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 */
mtime_t next_exchange; /**< when can we send data */
int i_nowp_port; /**< port to which submit */
char *psz_nowp_file; /**< file to which submit */
#endif
- bool 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 */
- bool b_submit; /**< do we have to submit ? */
+ bool b_submit; /**< do we have to submit ? */
- bool b_state_cb; /**< if we registered the
+ bool b_state_cb; /**< if we registered the
* "state" callback */
- bool b_meta_read; /**< if we read the song's
+ bool b_meta_read; /**< if we read the song's
* metadata already */
};
p_intf->p_sys = p_sys;
vlc_mutex_init( &p_sys->lock );
+ vlc_cond_init( &p_sys->wait );
- p_playlist = pl_Yield( p_intf );
+ p_playlist = pl_Hold( p_intf );
PL_LOCK;
var_AddCallback( p_playlist, "playlist-current", ItemChange, p_intf );
PL_UNLOCK;
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 );
+ p_playlist = pl_Hold( p_intf );
if( p_playlist )
{
PL_LOCK;
p_input = p_playlist->p_input;
if ( p_input )
{
- vlc_object_yield( p_input );
+ vlc_object_hold( p_input );
if( p_sys->b_state_cb )
var_DelCallback( p_input, "state", PlayingChange, p_intf );
pl_Release( p_intf );
}
- 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;
for( i = 0; i < p_sys->i_songs; i++ )
DeleteSong( &p_sys->p_queue[i] );
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 );
}
uint8_t p_buffer[1024];
char *p_buffer_pos;
int i_post_socket;
+ int canc = vlc_savecancel();
intf_sys_t *p_sys = p_intf->p_sys;
{
bool b_wait = false;
- vlc_object_lock( p_intf );
- if( !vlc_object_alive( p_intf ) )
- {
- vlc_object_unlock( p_intf );
- msg_Dbg( p_intf, "audioscrobbler is dying");
- return;
- }
+ 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_object_timedwait( p_intf, p_sys->next_exchange ) == 0;
+ b_wait = vlc_cond_timedwait( &p_sys->wait, &p_sys->lock,
+ 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 );
+ vlc_cond_wait( &p_sys->wait, &p_sys->lock );
+ vlc_cleanup_run();
+ canc = vlc_savecancel();
if( b_wait )
continue; /* holding on until next_exchange */
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 */
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=%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,
- 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 );
continue;
}
}
+ vlc_restorecancel( canc );
}
/*****************************************************************************
VLC_UNUSED( p_this ); VLC_UNUSED( psz_var );
- if( p_intf->b_dead )
- return VLC_SUCCESS;
-
if( p_sys->b_meta_read == false && newval.i_int >= PLAYING_S )
{
ReadMetaData( p_intf );
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 = false;
p_sys->b_meta_read = false;
p_sys->b_submit = false;
- p_playlist = pl_Yield( p_intf );
+ p_playlist = pl_Hold( p_intf );
PL_LOCK;
p_input = p_playlist->p_input;
return VLC_SUCCESS;
}
- vlc_object_yield( p_input );
+ vlc_object_hold( p_input );
PL_UNLOCK;
pl_Release( p_intf );
p_sys->time_total_pauses;
played_time /= 1000000; /* µs → s */
- if( ( played_time < 240 ) &&
- ( played_time < ( p_sys->p_current_song.i_l / 2 ) ) )
+ /*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 )
{
- msg_Dbg( p_this, "Song not listened long enough, not submitting" );
+ msg_Dbg( p_this, "Song too short (< 30s), not submitting" );
goto end;
}
- if( p_sys->p_current_song.i_l < 30 )
+ /* 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 too short (< 30s), not submitting" );
+ msg_Dbg( p_this, "Song not listened long enough, not submitting" );
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" );
-/*XXX*/ msg_Dbg( p_this, "%s %s", p_sys->p_current_song.psz_a, p_sys->p_current_song.psz_t );
goto end;
}
p_sys->i_songs++;
/* signal the main loop we have something to submit */
- vlc_object_signal( VLC_OBJECT( p_this ) );
+ vlc_cond_signal( &p_sys->wait );
end:
DeleteSong( &p_sys->p_current_song );
intf_sys_t *p_sys = p_this->p_sys;
- p_playlist = pl_Yield( p_this );
+ p_playlist = pl_Hold( p_this );
PL_LOCK;
p_input = p_playlist->p_input;
if( !p_input )
return( VLC_SUCCESS );
}
- vlc_object_yield( p_input );
+ vlc_object_hold( p_input );
PL_UNLOCK;
pl_Release( 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; \
} \
projects / vlc / blobdiff