Changeset c2ec30b423d074da6feb53c9c01e800ef9bcb286

Timestamp:

27/11/06 02:42:48 (2 years ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1164591768 +0000

git-parent:

[7ac42ed10d35c37ecf2e3dbde47fa904df608200]

git-author:

Rafaël Carré <funman@videolan.org> 1164591768 +0000

Message:

Merge 2 functions for reading meta data
Simplify interval checking
Sleeps 10 seconds more
Releases input 1 time instead of 2

Files:

• modules/misc/audioscrobbler.c (modified) (21 diffs)

modules/misc/audioscrobbler.c

@@ -37 +37 @@
-#include <time.h>
-#endif
-
-
-
-
+
-#include <vlc/vlc.h>
-#include <vlc_interface.h>
@@ -83 +80 @@
-
-    /* data about audioscrobbler session */
-
-
+
-    char                    *psz_submit_host;   /* where to submit data ? */
-    int                     i_submit_port;      /* at which port ?        */
@@ -114 +110 @@
-static int Handshake    ( intf_thread_t *p_sd );
-static int ReadMetaData ( intf_thread_t *p_this );
-static int ReadLocalMetaData( intf_thread_t *p_this, input_thread_t  *p_input );
-void DeleteQueue        ( audioscrobbler_queue_t *p_queue );
-
@@ -186 +181 @@
-    }
-
+    p_intf->p_sys = p_sys;
+
-    vlc_mutex_init( p_this, &p_sys->lock );
-
@@ -192 +189 @@
-    p_sys->psz_submit_file = NULL;
-    p_sys->b_handshaked = VLC_FALSE;
-
-
+
-    p_sys->psz_username = NULL;
-    p_sys->b_paused = VLC_FALSE;
@@ -212 +208 @@
-    p_sys->p_current_song = malloc( sizeof( audioscrobbler_song_t ) );
-    MALLOC_CHECK( p_sys->p_current_song )
+    time( &p_sys->p_current_song->time_playing );
-
-    /* queues can't contain more than 10 songs */
@@ -301 +298 @@
-    audioscrobbler_queue_t  *p_first_queue;
-    int                     i_post_socket;
-    /* TODO: remove when meta_engine works */
-    time_t                  played_time;
-
@@ -329 +325 @@
-         * and if waiting interval is elapsed */
-        if ( ( p_sys->p_first_queue->i_songs_nb > 0 ) &&
-
-
+
-        {
-            /* handshake if needed */
@@ -348 +343 @@
-                        intf_UserFatal( p_this, VLC_FALSE,
-                            _("Last.fm username not set"),
-
+ 
-                            "audioscrobbler plugin, and then restart VLC.\n"
-                            "Visit https://www.last.fm/join/ to get an account")
@@ -369 +364 @@
-                        /* protocol error : we'll try later */
-                        vlc_mutex_lock ( &p_sys->lock );
-p_sys->i_interval = DEFAULT_INTERVAL
-time( &p_sys->time_last_interval )
+time( &p_sys->time_next_exchange )
+p_sys->time_next_exchange += DEFAULT_INTERVAL
-                        vlc_mutex_unlock ( &p_sys->lock );
-                        break;
@@ -411 +406 @@
-            {
-                /* If connection fails, we assume we must handshake again */
-p_sys->i_interval = DEFAULT_INTERVAL
-time( &p_sys->time_last_interval )
+time( &p_sys->time_next_exchange )
+p_sys->time_next_exchange += DEFAULT_INTERVAL
-                p_sys->b_handshaked = VLC_FALSE;
-                vlc_mutex_unlock( &p_sys->lock );
@@ -435 +430 @@
-            if ( p_buffer_pos )
-            {
-
+
+
-                                            strlen( "INTERVAL " ) );
-                time( &p_sys->time_last_interval );
-            }
-
@@ -498 +493 @@
-        {
-            /* we read the metadata of the playing song */
-            /* TODO: remove when meta_engine works */
-            time( &played_time );
-            played_time -= p_sys->p_current_song->time_playing;
@@ -505 +499 @@
-            vlc_mutex_unlock( &p_sys->lock );
-
-
-
+
+
+
-            {
-                if ( ReadMetaData( p_this ) == VLC_ENOMEM )
@@ -592 +587 @@
-        PL_UNLOCK;
-        pl_Release( p_playlist );
+
-        vlc_mutex_lock( &p_sys->lock );
-
@@ -598 +594 @@
-
-        vlc_mutex_unlock( &p_sys->lock );
+
-        return VLC_SUCCESS;
-    }
@@ -811 +808 @@
-    if ( p_buffer_pos )
-    {
-
-
+
+
+
-    }
-
@@ -968 +966 @@
-{
-    playlist_t          *p_playlist;
-
+    
-    vlc_value_t         video_val;
-
-    intf_sys_t          *p_sys      = p_this->p_sys;
-
-    p_playlist = pl_Yield( p_this );
-    PL_LOCK;
-    p_input = p_playlist->p_input;
-
-    if( !p_input )
-    {
-        PL_UNLOCK;
-        pl_Release( p_playlist );
-        return( VLC_SUCCESS );
-    }
-
-    vlc_object_yield( p_input );
-    PL_UNLOCK;
-    pl_Release( p_playlist );
-
-    var_Change( p_input, "video-es", VLC_VAR_CHOICESCOUNT, &video_val, NULL );
-    if( ( video_val.i_int > 0 ) || \
-        ( input_GetItem(p_input)->i_type == ITEM_TYPE_NET ) )
-    {
-        msg_Dbg( p_this, "Not an audio only local file -> no submission");
-        vlc_object_release( p_input );
-
-        vlc_mutex_lock( &p_sys->lock );
-        p_sys->b_queued = VLC_TRUE;
-        p_sys->b_metadata_read = VLC_TRUE;
-        vlc_mutex_unlock( &p_sys->lock );
-
-        return VLC_SUCCESS;
-    }
-
-    return ReadLocalMetaData( p_this, p_input );    
-}
-
-/*****************************************************************************
- * ReadLocalMetaData : Puts current song's meta data in p_sys->p_current_song
- *****************************************************************************/
-static int ReadLocalMetaData( intf_thread_t *p_this, input_thread_t  *p_input )
-{
-    char                *psz_title      = NULL;
-    char                *psz_artist     = NULL;
@@ -1020 +978 @@
-    int                 i_status;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    #define FREE_INPUT_AND_CHARS \
@@ -1056 +1042 @@
-        }
-
+    i_status = input_GetItem(p_input)->p_meta->i_status;
+
+    b_waiting = VLC_TRUE;
+/*  TODO: meta data fetching doesn't work atm
-    vlc_mutex_lock( &p_sys->lock );
-    b_waiting = p_sys->b_waiting_meta;
-    vlc_mutex_unlock( &p_sys->lock );
-
-
-
-
+
+
+
+
+
+
-    {
-        ALLOC_ITEM_META( psz_artist, p_meta->psz_artist )
@@ -1101 +1093 @@
-
-        msg_Dbg( p_this, "Meta data registered, waiting to be queued" );
-
-
-
-
-
+
+
+
-    return VLC_SUCCESS;
-#undef FREE_INPUT_AND_CHARS