Skip to content

V
vlc
Commit 65de9dd7 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

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
parent cbeed909
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 572 additions and 31 deletions
THANKS
View file @ 65de9dd7
......@@ -84,6 +84,7 @@ Farzaneh Sarafraz <farzaneh at farsiweb dot info> - Persian localisation
Fouzia Bourai <fbourai at cerist dot dz> - Arabic localisation
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
Geoffrey Roussel <meka321 at hotmail dot com> - Christmas easter egg Artwork
......@@ -103,8 +104,8 @@ Ilkka Ollakka - SDP bitrate patch, various VLM fixes, transcode afilter/vfilter
Jan David Mol <jjdmol at gmail.com> - Suggested some flags for ffmpeg building
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
Javier Varela <tonxabar at hotmail.com> - Spanish translation
Jean-Alexis Montignies <ja at sente.ch> - coreaudio multiple streams fix
Jasper Alias <j.alias at student.hhs.nl>- Mozilla plugin toolbar
Javier Varela <tonxabar at hotmail.com> - Spanish translation Jean-Alexis Montignies <ja at sente.ch> - coreaudio multiple streams fix
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
Dugal Harris <dugalh at protoclea dot. co dot za > - ActiveX bug fixes
......
configure.ac
View file @ 65de9dd7
......@@ -5805,7 +5805,7 @@ then
MOZILLA_CONFIG_H="${firefox_include}/mozilla-config.h"
fi
if grep '^#define MOZ_X11 1' ${MOZILLA_CONFIG_H} 2>&1 > /dev/null ; then
VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt])
VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm])
fi
VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}])
VLC_ADD_LDFLAGS([mozilla],[${MOZILLA_LDFLAGS}])
......@@ -5842,10 +5842,10 @@ then
AC_CHECK_LIB(Xt,XtStrings,
[
VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}])
VLC_ADD_LIBS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])
VLC_ADD_LIBS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE -lXpm])
],
[],
[[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE]
[[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE -lXpm]
])
LDFLAGS="${LDFLAGS_save}"
fi
......
mozilla/vlcplugin.h
View file @ 65de9dd7
......@@ -52,6 +52,7 @@
# include <X11/Xlib.h>
# include <X11/Intrinsic.h>
# include <X11/StringDefs.h>
# include <X11/X.h>
#endif
class VlcPlugin
......@@ -87,6 +88,14 @@ public:
#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
uint16 i_npmode; /* either NP_EMBED or NP_FULL */
......@@ -113,6 +122,7 @@ private:
#endif
#if XP_UNIX
unsigned int i_width, i_height;
Window npvideo, npcontrol;
#endif
};
......@@ -151,6 +161,7 @@ private:
"video/x-ms-asf:asf,asx:Windows Media Video;" \
"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;" \
/* WAV audio */ \
......
mozilla/vlcshell.cpp
View file @ 65de9dd7
This diff is collapsed.
share/mozilla/fullscreen.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * fullscreen_xpm[] = {
"26 20 5 1",
" c None",
". c #999999",
"+ c #989898",
"@ c #9A9A9A",
"# c #9B9B9B",
" . . ",
"... . . ...",
" .... .... ",
" ... ... ",
" .... +.+@+.@@..# .... ",
" ................ ",
" ...............@ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" ................ ",
" .... .@+....@.@ .... ",
" ... ... ",
" .... .... ",
"... . . ...",
" . . "};
share/mozilla/pause.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * pause_xpm[] = {
"33 27 3 1",
"+ c None",
". c #999999",
"* c #FFFFFF",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++.............",
".............+++++++............."};
share/mozilla/play.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * play_xpm[] = {
"34 27 3 1",
"+ c None",
". c #999999",
"* c #FFFFFF",
".+++++++++++++++++++++++++++++++++",
"....++++++++++++++++++++++++++++++",
"......++++++++++++++++++++++++++++",
".........+++++++++++++++++++++++++",
"...........+++++++++++++++++++++++",
"..............++++++++++++++++++++",
"................++++++++++++++++++",
"...................+++++++++++++++",
".....................+++++++++++++",
"........................++++++++++",
"..........................++++++++",
".............................+++++",
"...............................+++",
".................................+",
"...............................+++",
".............................+++++",
"..........................++++++++",
"........................++++++++++",
".....................+++++++++++++",
"...................+++++++++++++++",
"................++++++++++++++++++",
"..............++++++++++++++++++++",
"...........+++++++++++++++++++++++",
".........+++++++++++++++++++++++++",
"......++++++++++++++++++++++++++++",
"....++++++++++++++++++++++++++++++",
".+++++++++++++++++++++++++++++++++"};
share/mozilla/skip_next.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * skip_next_xpm[] = {
"30 18 2 1",
" c None",
". c #999999",
". . ..",
".. .. ..",
".... .... ..",
"..... ...... ..",
"....... ....... ..",
"......... ......... ..",
".......... .......... ..",
"............ ............ ..",
"............. ................",
"............. ............. ..",
"............ ............ ..",
".......... .......... ..",
"......... ......... ..",
"....... ....... ..",
"...... ..... ..",
".... .... ..",
".. .. ..",
". . .."};
share/mozilla/skip_previous.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * skip_previous_xpm[] = {
"30 18 2 1",
" c None",
". c #999999",
".. . .",
".. .. ..",
".. .... ....",
".. ...... ......",
".. ....... .......",
".. ......... .........",
".. .......... ..........",
".. ............ ............",
".. ............. .............",
".. ............. .............",
".. ............ ............",
".. .......... ..........",
".. ......... .........",
".. ....... .......",
".. ...... ......",
".. .... ....",
".. .. ..",
".. . ."};
share/mozilla/stop.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * fs_stop_xpm[] = {
"27 27 2 1",
" c None",
". c #999999",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"...........................",
"..........................."};
share/mozilla/time_icon.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * time_slider_knob_xpm[] = {
"8 6 3 1",
" c None",
". c #999999",
"* c #999999",
" *..* ",
" *....* ",
"*......*",
"*......*",
" *....* ",
" *..* "};
share/mozilla/time_line.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * time_line2_xpm[] = {
"518 2 2 1",
" c None",
". c #999999",
"......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................",
"......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................"};
share/mozilla/volume_knob.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * volume_knob_xpm[] = {
"9 9 10 1",
" c None",
". c #989898",
"+ c #999999",
"@ c #8D8D8D",
"# c #7A7A7A",
"$ c #686868",
"% c #272727",
"& c #262626",
"* c #2F2F2F",
"= c #585858",
" ... ",
" .+@#@+. ",
" +$%&%$+ ",
".@%*=*%@.",
".#&=+=&#.",
".@%*=*%@.",
" +$%&%$+ ",
" .+@#@+. ",
" ... "};
share/mozilla/volume_max.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * volume_max_xpm[] = {
"15 13 3 1",
" c None",
". c #999999",
"+ c #9A9A9A",
" ",
" . . ",
" .. . ",
" ... . . ",
" ..... . .",
"....... + . .",
"....... + .",
"....... + + .",
" .... . .",
" ... + . ",
" .. . ",
" . ",
" "};
share/mozilla/volume_mute.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * volume_mute_xpm[] = {
"7 11 2 1",
" c None",
". c #999999",
" .",
" ..",
" ...",
" ....",
".......",
".......",
".......",
" .....",
" ...",
" ..",
" ."};
share/mozilla/volume_slider_bar.xpm 0 → 100644
View file @ 65de9dd7
/* XPM */
static char * volume_slider_bar_xpm[] = {
"95 2 2 1",
" c None",
". c #999999",
" ............................................................................................. ",
" ............................................................................................. "};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment