Changeset 70cd338dfab3e7e6938968287b177381e5ad94c7

Timestamp:

14/05/06 17:21:25 (2 years ago)

Author:

Cyril Deguet <asmax@videolan.org>

git-committer:

Cyril Deguet <asmax@videolan.org> 1147620085 +0000

git-parent:

[04630cb913554782a9f0d1e03d3a59f95ada0ecc]

git-author:

Cyril Deguet <asmax@videolan.org> 1147620085 +0000

Message:

* vlcproc.cpp: fixed detection of play/pause status (when the popup menu or
keyboard shortcut is used to toggle pause instead of a skin button)

Files:

• modules/gui/skins2/src/vlcproc.cpp (modified) (5 diffs)

modules/gui/skins2/src/vlcproc.cpp

@@ -301 +301 @@
-void VlcProc::refreshPlaylist()
-{
-    // Get the status of the playlist
-    VarBoolImpl *pVarPlaying = (VarBoolImpl*)m_cVarPlaying.get();
-    VarBoolImpl *pVarStopped = (VarBoolImpl*)m_cVarStopped.get();
-    VarBoolImpl *pVarPaused = (VarBoolImpl*)m_cVarPaused.get();
-    playlist_status_t status =
-             getIntf()->p_sys->p_playlist->status.i_status;
-
-    pVarPlaying->set( status == PLAYLIST_RUNNING );
-    pVarStopped->set( status == PLAYLIST_STOPPED );
-    pVarPaused->set( status == PLAYLIST_PAUSED );
-
-    // Refresh the random variable
-    VarBoolImpl *pVarRandom = (VarBoolImpl*)m_cVarRandom.get();
@@ -339 +328 @@
-    VarText *pSampleRate = (VarText*)m_cVarStreamSampleRate.get();
-    VarBoolImpl *pVarFullscreen = (VarBoolImpl*)m_cVarFullscreen.get();
+    VarBoolImpl *pVarPlaying = (VarBoolImpl*)m_cVarPlaying.get();
+    VarBoolImpl *pVarStopped = (VarBoolImpl*)m_cVarStopped.get();
+    VarBoolImpl *pVarPaused = (VarBoolImpl*)m_cVarPaused.get();
+
+    input_thread_t *pInput = getIntf()->p_sys->p_input;
-
-    // Update the input
@@ -353 +347 @@
-    }
-
-    input_thread_t *pInput = getIntf()->p_sys->p_input;
-
-    if( pInput && !pInput->b_die )
@@ -392 +385 @@
-            vlc_object_release( pVout );
-        }
+
+        // Refresh play/pause status
+        int state = var_GetInteger( pInput, "state" );
+        pVarStopped->set( false );
+        pVarPlaying->set( state != PAUSE_S );
+        pVarPaused->set( state == PAUSE_S );
-    }
-    else
@@ -401 +400 @@
-        pVarHasAudio->set( false );
-        pVarHasVout->set( false );
+        pVarStopped->set( true );
+        pVarPlaying->set( false );
+        pVarPaused->set( false );
-    }
-}