Changeset 227de1f76923c66c00711b6adb6721a5a325e28d

Timestamp:

18/06/08 11:39:23 (6 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1213781963 +0200

git-parent:

[afe32c01a91575ec9098ec6a60a15c6a897e27d4]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1213738214 +0200

Message:

Try to correctly guess which button has been clicked in the mozilla toolbar.

Files:

• projects/mozilla/vlcplugin.cpp (modified) (1 diff)
• projects/mozilla/vlcplugin.h (modified) (2 diffs)
• projects/mozilla/vlcshell.cpp (modified) (1 diff)

projects/mozilla/vlcplugin.cpp

@@ -673 +673 @@
-    XFreeGC( p_display, gc );
-}
+
+vlc_toolbar_clicked_t VlcPlugin::getToolbarButtonClicked( int i_xpos, int i_ypos )
+{
+    unsigned int i_dest = 0;
+    int i_playing = 0;
+    bool b_mute = false;
+    libvlc_exception_t ex;
+
+    if( i_xpos >= i_tb_height )
+        return clicked_Unknown;
+
+    /* Note: the order of testing is dependend on the original
+     * drawing positions of the icon buttons. Buttons are tested
+     * left to right.
+     */
+
+    /* get isplaying */
+    libvlc_exception_init( &ex );
+    i_playing = libvlc_playlist_isplaying( getVLC(), &ex );
+    libvlc_exception_clear( &ex );
+
+    /* get mute info */
+    libvlc_exception_init(&ex);
+    b_mute = libvlc_audio_get_mute( getVLC(), &ex );
+    libvlc_exception_clear( &ex );
+
+
+    /* is Pause of Play button clicked */
+    if( (i_playing != 1) &&
+        (i_ypos >= BTN_SPACE>>1) &&
+        (i_ypos <= p_btnPlay->width + (BTN_SPACE>>1)) )
+        return clicked_Play;
+    else if( (i_ypos >= BTN_SPACE>>1)  &&
+             (i_ypos <= p_btnPause->width) )
+        return clicked_Pause;
+
+    /* is Stop button clicked */
+    if( i_playing != 1 )
+        i_dest += BTN_SPACE + p_btnPause->width + (BTN_SPACE>>1);
+    else
+        i_dest += BTN_SPACE + p_btnPlay->width + (BTN_SPACE>>1);
+    if( (i_ypos >= i_dest) &&
+        (i_ypos <= p_btnStop->width + (BTN_SPACE>>1)) )
+        return clicked_Stop;
+
+    /* is Fullscreen button clicked */
+    i_dest += (p_btnStop->width + (BTN_SPACE>>1));
+    if( (i_ypos >= i_dest) &&
+        (i_ypos <= p_btnFullscreen->width + (BTN_SPACE>>1)) )
+        return clicked_Fullscreen;
+
+    /* is Mute or Unmute button clicked */
+    i_dest += (p_btnFullscreen->width + (BTN_SPACE>>1));
+    if( !b_mute && (i_ypos >= i_dest) &&
+        (i_ypos <= p_btnMute->width + (BTN_SPACE>>1)) )
+        return clicked_Mute;
+    else if( (i_ypos >= i_dest) &&
+             (i_ypos <= p_btnUnmute->width + (BTN_SPACE>>1)) )
+        return clicked_Unmute;
+
+    /* is timeline clicked */
+    if( !b_mute )
+        i_dest += (p_btnMute->width + (BTN_SPACE>>1));
+    else
+        i_dest += (p_btnUnmute->width + (BTN_SPACE>>1));
+    if( (i_ypos >= i_dest) &&
+        (i_ypos <= p_timeline->width + (BTN_SPACE>>1)) )
+        return clicked_timeline;
+
+    /* is time button clicked */
+    i_dest += (p_timeline->width + (BTN_SPACE>>1));
+    if( (i_ypos >= i_dest) &&
+        (i_ypos <= p_btnTime->width + (BTN_SPACE>>1)) )
+        return clicked_Time;
+
+    return clicked_Unknown;
+}
+#undef BTN_SPACE
-#endif

projects/mozilla/vlcplugin.h

@@ -66 +66 @@
-#   define __MIN(a, b)   ( ((a) < (b)) ? (a) : (b) )
-#endif
+
+typedef enum vlc_toolbar_clicked_e {
+    clicked_Unknown = 0,
+    clicked_Play,
+    clicked_Pause,
+    clicked_Stop,
+    clicked_timeline,
+    clicked_Time,
+    clicked_Fullscreen,
+    clicked_Mute,
+    clicked_Unmute
+} vlc_toolbar_clicked_t;
-
-class VlcPlugin
@@ -116 +128 @@
-    int                 setToolbarSize(unsigned int width, unsigned int height)
-                            { i_tb_width = width; i_tb_height = height; return 1; };
+    vlc_toolbar_clicked_t getToolbarButtonClicked( int i_xpos, int i_ypos );
-#endif
-

projects/mozilla/vlcshell.cpp

@@ -843 +843 @@
-        libvlc_exception_clear( &ex );
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                libvlc_exception_init( &ex );
-f_length = libvlc_media_player_get_length( p_md, &ex ) / 100
+i_playing = libvlc_playlist_isplaying( p_plugin->getVLC(), &ex )
-                libvlc_exception_clear( &ex );
-
-                f_length = (float)f_length *
-                           ( ((float)i_xPos-4 ) / ( ((float)i_width-8)/100) );
-
-                libvlc_exception_init( &ex );
-
+
+
+
+
-                libvlc_exception_clear( &ex );
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            {
-                libvlc_exception_init( &ex );
-set_fullscreen( p_md, 1
+playlist_stop( p_plugin->getVLC()
-                libvlc_exception_clear( &ex );
-            }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if( p_md ) libvlc_media_player_release( p_md );
-    }