net_Printf: automagic cast to VLC object

[vlc] / modules / misc / audioscrobbler.c

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index 7dd9401500717dbcdd4f6b5ae039bfcd22c7157a..fbcc95a70b4b7f2cad712958ff05ab6d294f3d73 100644 (file)
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -26,6 +26,7 @@
  * http://www.audioscrobbler.net/development/protocol/
  *
  * TODO:    "Now Playing" feature (not mandatory)
+ *          Update to new API? http://www.lastfm.fr/api
  */
 /*****************************************************************************
  * Preamble
@@ -134,10 +135,8 @@ static void HandleInterval  ( mtime_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")
-#if 0
-    #define URL_TEXT       N_("Scrobbler URL")
-    #define URL_LONGTEXT   N_("The URL set for an alternative scrobbler engine")
-#endif
+#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
@@ -167,10 +166,8 @@ vlc_module_begin ()
                 USERNAME_TEXT, USERNAME_LONGTEXT, false )
     add_password( "lastfm-password", "", NULL,
                 PASSWORD_TEXT, PASSWORD_LONGTEXT, false )
-#if 0
     add_string( "scrobbler-url", "post.audioscrobbler.com", NULL,
-                URL_TEXT, URL_LONGTEXT, false )*/
-#endif
+                URL_TEXT, URL_LONGTEXT, false )
     set_capability( "interface", 0 )
     set_callbacks( Open, Close )
 vlc_module_end ()
@@ -299,7 +296,7 @@ static void Run( intf_thread_t *p_intf )
                     /* username not set */
                     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.")
                     );
@@ -397,7 +394,7 @@ static void Run( intf_thread_t *p_intf )
 
         /* 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_host,
             VERSION, psz_submit
@@ -469,6 +466,8 @@ 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;
@@ -495,7 +494,10 @@ static int PlayingChange( vlc_object_t *p_this, const char *psz_var,
     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 )
+    {
         p_sys->time_total_pauses += ( mdate() - p_sys->time_pause );
+        p_sys->time_pause = 0;
+    }
 
     return VLC_SUCCESS;
 }
@@ -539,9 +541,9 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     }
 
     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( video_val.i_int > 0 )
     {
-        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;
     }
@@ -729,11 +731,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 );
@@ -786,11 +788,7 @@ static int Handshake( intf_thread_t *p_this )
     strncpy( p_sys->psz_auth_token, psz_auth_token, 33 );
     free( psz_auth_token );
 
-#if 0
-    psz_scrobbler_url = config_GetPsz( p_this, "scrobbler-url" );
-#else
-    psz_scrobbler_url = strdup( "post.audioscrobbler.com" );
-#endif
+    psz_scrobbler_url = var_InheritString( p_this, "scrobbler-url" );
     if( !psz_scrobbler_url )
     {
         free( psz_username );
@@ -840,7 +838,7 @@ static int Handshake( intf_thread_t *p_this )
         /* authentication failed, bad username/password combination */
         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;
     }