Changeset 65de9dd76f0ec5cfff4a84d3fbd818942321114d

Timestamp:

01/19/08 15:54:38 (7 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1200754478 +0000

git-parent:

[cbeed9092767db95a97ea79f6c8afbcf1dec2ea9]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1200754478 +0000

Message:

Patch by Frans van Veen and Jasper Alias with modifications by me.

New;
- Mozilla/firefox toolbar for Linux
- Play, Pause, Stop, Fullscreen and Mute buttons
- Timeline, you can click on any place in the timeline and the movie will jump to it

Fixed:
- Coding style, readibility
- Maximum 80 characters per line
- Major memory leak, due to not releasing image data

Known bugs:
- updating timeline not working well because callback function not working "libvlc_event_attach......"
- white line below the toolbar
- play/pause toggle not working well because ticket #1065

Files:

• THANKS (modified) (2 diffs)
• configure.ac (modified) (2 diffs)
• mozilla/vlcplugin.h (modified) (4 diffs)
• mozilla/vlcshell.cpp (modified) (14 diffs)
• share/mozilla/fullscreen.xpm (added)
• share/mozilla/pause.xpm (added)
• share/mozilla/play.xpm (added)
• share/mozilla/skip_next.xpm (added)
• share/mozilla/skip_previous.xpm (added)
• share/mozilla/stop.xpm (added)
• share/mozilla/time_icon.xpm (added)
• share/mozilla/time_line.xpm (added)
• share/mozilla/volume_knob.xpm (added)
• share/mozilla/volume_max.xpm (added)
• share/mozilla/volume_mute.xpm (added)
• share/mozilla/volume_slider_bar.xpm (added)

THANKS

@@ -85 +85 @@
-François Seingier <francois.seingier at club-internet.fr> - TTL setting in the wx stream output dialog
-Frank Chao <frank0624 at gmail.com> - Chinese Traditional translation
+Frans van Veen <f.m.j.c.vanveen at student.hhs.nl> - Mozilla plugin toolbar
-Fumio Nakayama <endymion at ca2.so-net.ne.jp> - Japanese translation
-Gabor Kelemen <kelemeng at gnome dot hu> - Hungarian translation
@@ -104 +105 @@
-Jan Gerber <j at v2v dot org> - patch theora decoding aspect ratio
-Jan Van Boghout <vlc at macrabbit.com> - iTunes like slider for OSX intf
-vier Varela <tonxabar at hotmail.com> - Spanish translation
-
+sper Alias <j.alias at student.hhs.nl>- Mozilla plugin toolbar
+avier Varela <tonxabar at hotmail.com> - Spanish translation J
-Jean-Baptiste Le Stang <jp.lestand at lestang.org> - Equalizer-GUI-fixes (OSX), Universal Binary Script
-Jean-Philippe Grimaldi <jeanphi at via.ecp.fr> - bug fixes

configure.ac

@@ -5806 +5806 @@
-        fi
-        if grep '^#define MOZ_X11 1' ${MOZILLA_CONFIG_H} 2>&1 > /dev/null ; then
-
+ -lXpm
-        fi
-        VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}])
@@ -5843 +5843 @@
-         [
-           VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}])
-
+ -lXpm
-         ],
-         [],
-
+ -lXpm
-        ])
-        LDFLAGS="${LDFLAGS_save}"

mozilla/vlcplugin.h

@@ -53 +53 @@
-#   include <X11/Intrinsic.h>
-#   include <X11/StringDefs.h>
+#   include <X11/X.h>
-#endif
-
@@ -88 +89 @@
-#if XP_UNIX
-    int                 setSize(unsigned width, unsigned height);
+    Window              getVideoWindow()
+                            { return npvideo; };
+    void                setVideoWindow(Window window)
+                            { npvideo = window; };
+    Window              getControlWindow()
+                            { return npcontrol; };
+    void                setControlWindow(Window window)
+                            { npcontrol = window; };
-#endif
-
@@ -114 +123 @@
-#if XP_UNIX
-    unsigned int     i_width, i_height;
+    Window           npvideo, npcontrol;
-#endif
-};
@@ -152 +162 @@
-    "application/x-mplayer2::Windows Media;" \
-    "video/x-ms-wmv:wmv:Windows Media;" \
+    "video/x-ms-wvx:wvx:Windows Media Video;" \
-    /* Google VLC */ \
-    "application/x-google-vlc-plugin::Google VLC plugin;" \

mozilla/vlcshell.cpp

@@ -30 +30 @@
-#include <string.h>
-#include <stdlib.h>
+#include <X11/xpm.h>
-
-/* Mozilla stuff */
@@ -46 +47 @@
-#undef X11_RESIZE_DEBUG
-
-
+
+
-
-/*****************************************************************************
@@ -54 +56 @@
-
-static void Redraw( Widget w, XtPointer closure, XEvent *event );
+static void ControlHandler( Widget w, XtPointer closure, XEvent *event );
-static void Resize( Widget w, XtPointer closure, XEvent *event );
-
@@ -185 +188 @@
-                    if( libvlc_playlist_isplaying(p_vlc, NULL) )
-                    {
-
+
+
-                        if( p_md )
-                        {
@@ -215 +219 @@
-                    if( libvlc_playlist_isplaying(p_vlc, NULL) )
-                    {
-
+
+
-                        if( p_md )
-                        {
@@ -241 +246 @@
-
-                    /* seems that firefox forgets to set the following on occasion (reload) */
-
+
+
-
-                    Rect rect;
@@ -439 +445 @@
-            }
-            /* attach our plugin object */
-
+
+
-
-            /* install our WNDPROC */
-            p_plugin->setWindowProc( (WNDPROC)SetWindowLong( drawable,
-              
+
-
-            /* change window style to our liking */
@@ -476 +483 @@
-    if( window && window->window )
-    {
-drawable
-drawable != (Window)curwin.window
+parent
+(parent != (Window)curwin.window)
-        {
-            Display *p_display = ((NPSetWindowCallbackStruct *)window->ws_info)->display;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            /* set/change parent window */
-p_vlc, (libvlc_drawable_t)drawable, NULL
+ p_vlc, (libvlc_drawable_t) video, NULL 
-
-            /* remember window */
-
+
+
+
-
-            Redraw( w, (XtPointer)p_plugin, NULL );
@@ -508 +549 @@
-        if( p_plugin->psz_target )
-        {
-
+
+
-            {
-                if( p_plugin->b_autoplay )
@@ -703 +745 @@
-            SetTextColor(hdc, RGB(255, 255, 255));
-            SetBkColor(hdc, RGB(0, 0, 0));
-
+
+
-
-            EndPaint( p_hwnd, &paintstruct );
@@ -726 +769 @@
-    XGCValues gcv;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    Display *p_display = ((NPSetWindowCallbackStruct *)window.ws_info)->display;
-
-    gcv.foreground = BlackPixel( p_display, 0 );
-drawable
-
-drawable
-
+video
+
+video
+- CONTROL_HEIGHT 
-
-    gcv.foreground = WhitePixel( p_display, 0 );
-    XChangeGC( p_display, gc, GCForeground, &gcv );
-
-drawable
-window.height
+video
+(window.height - CONTROL_HEIGHT)
-                 WINDOW_TEXT, strlen(WINDOW_TEXT) );
-
+    /* RedrawToolbar */
+    gcv.foreground = BlackPixel( p_display, 0 );
+    gc = XCreateGC( p_display, control, GCForeground, &gcv );
+
+    XFillRectangle( p_display, control, gc,
+                    0, 0, window.width, CONTROL_HEIGHT );
+
+
+    gcv.foreground = WhitePixel( p_display, 0 );
+    XChangeGC( p_display, gc, GCForeground, &gcv );
+
+    /* get media instance */
+    libvlc_exception_t ex;
+    libvlc_exception_init( &ex );
+    p_md = libvlc_playlist_get_media_instance( p_plugin->getVLC(), &ex );
+    libvlc_exception_clear( &ex );
+
+    /* get isplaying */
+    libvlc_exception_init( &ex );
+    i_playing = libvlc_playlist_isplaying( p_plugin->getVLC(), &ex );
+    libvlc_exception_clear( &ex );
+
+    /* get mute info */
+    libvlc_exception_init(&ex);
+    b_mute = libvlc_audio_get_mute( p_plugin->getVLC(), &ex );
+    libvlc_exception_clear( &ex );
+
+    /* get movie position in % */
+    if( i_playing == 1 )
+    {
+        libvlc_exception_init( &ex );
+        f_position = libvlc_media_instance_get_position(p_md, &ex)*100;
+        libvlc_exception_clear( &ex );
+    }
+    libvlc_media_instance_release(p_md);
+
+    /* load icons */
+    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/play.xpm",
+                        &p_playIcon, NULL, NULL);
+    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/pause.xpm",
+                        &p_pauseIcon, NULL, NULL);
+    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/stop.xpm",
+                        &p_stopIcon, NULL, NULL );
+    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/time_line.xpm",
+                        &p_timeline, NULL, NULL);
+    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/time_icon.xpm",
+                        &p_timeKnob, NULL, NULL);
+    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/fullscreen.xpm",
+                        &p_fscreen, NULL, NULL);
+    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/volume_max.xpm",
+                        &p_muteIcon, NULL, NULL);
+    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/volume_mute.xpm",
+                        &p_unmuteIcon, NULL, NULL);
+
+#if 1 /* DEBUG */
+    if( !p_playIcon )
+    {
+        fprintf(stderr, "Error: playImage not found\n");
+    }
+    if( !p_pauseIcon )
+    {
+        fprintf(stderr, "Error: pauseImage not found\n");
+    }
+    if( !p_stopIcon )
+    {
+        fprintf(stderr, "Error: stopImage not found\n");
+    }
+    if( !p_timeline )
+    {
+        fprintf(stderr, "Error: TimeLineImage not found\n");
+    }
+    if( !p_timeKnob )
+    {
+        fprintf(stderr, "Error: TimeIcon not found\n");
+    }
+    if( !p_fscreen )
+    {
+        fprintf(stderr, "Error: FullscreenImage not found\n");
+    }
+    if( !p_muteIcon )
+    {
+        fprintf(stderr, "Error: MuteImage not found\n");
+    }
+    if( !p_unmuteIcon )
+    {
+        fprintf(stderr, "Error: UnMuteImage not found\n");
+    }
+#endif
+
+    /* position icons */
+    if( p_pauseIcon && (i_playing == 1) )
+    {
+        XPutImage( p_display, control, gc, p_pauseIcon, 0, 0, 4, 14,
+                   p_pauseIcon->width, p_pauseIcon->height );
+    }
+    else if( p_playIcon )
+    {
+        XPutImage( p_display, control, gc, p_playIcon, 0, 0, 4, 14,
+                   p_playIcon->width, p_playIcon->height );
+    }
+
+    if( p_stopIcon )
+        XPutImage( p_display, control, gc, p_stopIcon, 0, 0, 39, 14,
+                   p_stopIcon->width, p_stopIcon->height );
+    if( p_fscreen )
+        XPutImage( p_display, control, gc, p_fscreen, 0, 0, 67, 21,
+                   p_fscreen->width, p_fscreen->height );
+
+    if( p_unmuteIcon && b_mute )
+    {
+        XPutImage( p_display, control, gc, p_unmuteIcon, 0, 0, 94, 30,
+                 p_unmuteIcon->width, p_unmuteIcon->height );
+    }
+    else if( p_muteIcon )
+    {
+        XPutImage( p_display, control, gc, p_muteIcon, 0, 0, 94, 30,
+                   p_muteIcon->width, p_muteIcon->height );
+    }
+
+    if( p_timeline )
+        XPutImage( p_display, control, gc, p_timeline, 0, 0, 4, 4,
+                   (window.width-8), p_timeline->height );
+    if( p_timeKnob && (f_position > 0) )
+    {
+        f_position = (((float)window.width-8)/100)*f_position;
+        XPutImage( p_display, control, gc, p_timeKnob, 0, 0, (4+f_position), 2,
+                   p_timeKnob->width, p_timeKnob->height );
+    }
+
+    /* Cleanup */
+    if( p_playIcon )   XDestroyImage( p_playIcon );
+    if( p_pauseIcon )  XDestroyImage( p_pauseIcon );
+    if( p_stopIcon )   XDestroyImage( p_stopIcon );
+    if( p_timeline )   XDestroyImage( p_timeline );
+    if( p_timeKnob )   XDestroyImage( p_timeKnob );
+    if( p_fscreen )    XDestroyImage( p_fscreen );
+    if( p_muteIcon )   XDestroyImage( p_muteIcon );
+    if( p_unmuteIcon ) XDestroyImage( p_unmuteIcon );
+
-    XFreeGC( p_display, gc );
-}
-
-Resize 
+ControlHandler
-{
-    VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(closure);
-    const NPWindow& window = p_plugin->getWindow();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    Display *p_display = ((NPSetWindowCallbackStruct *)window.ws_info)->display;
-
@@ -769 +1043 @@
-#endif /* X11_RESIZE_DEBUG */
-
-window.height
+(window.height - CONTROL_HEIGHT)
-    {
-        /* size already set */
@@ -776 +1050 @@
-
-
-window.height
+(window.height - CONTROL_HEIGHT)
-
-#ifdef X11_RESIZE_DEBUG
@@ -808 +1082 @@
-
-        i_ret = XResizeWindow( p_display, base_window,
-window.height
+( window.height - CONTROL_HEIGHT )
-
-#ifdef X11_RESIZE_DEBUG