Commit 62fd0255 authored by Gildas Bazin's avatar Gildas Bazin

* added a wxwindows interface using the wxWindows cross-platform GUI framework.
   The interface is quite basic for now but should be functional anyway.
   (you need to have wxWindows >= 2.3.0 installed to use this plugin)
parent de6f5823
......@@ -125,6 +125,8 @@ case "x${target_os}" in
# add ws2_32 for closesocket, select, recv
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"
CPPFLAGS="${CPPFLAGS_save}"
CXXFLAGS_save="${CXXFLAGS_save} -fvtable-thunks";
CXXFLAGS="${CXXFLAGS_save}"
LDFLAGS_vlc="${LDFLAGS_vlc} -lws2_32 -lnetapi32 -mwindows"
LDFLAGS_ipv4="${LDFLAGS_ipv4} -lws2_32"
LDFLAGS_ipv6="${LDFLAGS_ipv6} -lws2_32"
......@@ -413,7 +415,7 @@ AC_CACHE_CHECK([if \$CC accepts -Wall -Winline],
AC_TRY_COMPILE([],,ac_cv_c_Wall_Winline=yes, ac_cv_c_Wall_Winline=no)])
if test "x${ac_cv_c_Wall_Winline}" != "xno"; then
CFLAGS_save="-Wall -Winline ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
CXXFLAGS_save="-Wall -Winline ${CXXFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
CXXFLAGS_save="-Wall ${CXXFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="-Wall -Winline ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
else
AC_CACHE_CHECK([if \$CC accepts -wall -winline],
......@@ -1956,6 +1958,46 @@ developement tools or remove the --enable-gnome option])
CPPFLAGS="${CPPFLAGS_save}"
fi])
dnl
dnl wxWindows module
dnl
AC_ARG_ENABLE(wxwindows,
[ --enable-wxwindows wxWindows support (default enabled)])
if test "x${enable_wxwindows}" != "xno"
then
WXWINDOWS_PATH="${PATH}"
AC_ARG_WITH(wx-config-path,
[ --with-wx-config-path=PATH wx-config path (default search in \$PATH)],
[ if test "x${with_wx_config_path}" != "xno"
then
WXWINDOWS_PATH="${with_wx_config_path}:${PATH}"
fi ])
# look for wx-config
AC_PATH_PROG(WX_CONFIG, wx-config, no, ${WXWINDOWS_PATH})
if test "x${WX_CONFIG}" != "xno"
then
if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
then
AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwindows.])
fi
CXXFLAGS_wxwindows="${CXXFLAGS_wxwindows} `${WX_CONFIG} --cflags`"
LDFLAGS_wxwindows="${LDFLAGS_wxwindows} `${WX_CONFIG} --libs`"
# now look for the wx.h header
CPPFLAGS="${save_CPPFLAGS} ${CXXFLAGS_wxwindows}"
ac_cv_wx_headers=yes
AC_CHECK_HEADERS(wx/wx.h, , [
ac_cv_wx_headers=no
echo "Cannot find wxWindows development headers."
])
if test "x${ac_cv_wx_headers}" = "xyes"
then
PLUGINS="${PLUGINS} wxwindows"
ALIASES="${ALIASES} wxvlc"
fi
CPPFLAGS="${save_CPPFLAGS}"
fi
fi
dnl
dnl Qt module
dnl
......
List of vlc plugins
$Id: LIST,v 1.3 2002/10/23 23:17:45 gbazin Exp $
$Id: LIST,v 1.4 2002/11/18 13:02:16 gbazin Exp $
* a52_system: input module for A52 decapsulation.
......@@ -143,6 +143,8 @@ $Id: LIST,v 1.3 2002/10/23 23:17:45 gbazin Exp $
* waveout: simple audio output module for Windows.
* wxwindows: interface module using the cross-platform wxWindows library.
* x11: video output module using the X11 API.
* xvideo: video output module using the XVideo API.
......
......@@ -46,6 +46,7 @@ EXTRA_DIST = \
gui/qnx/Modules.am \
gui/qt/Modules.am \
gui/win32/Modules.am \
gui/wxwindows/Modules.am \
misc/Modules.am \
misc/dummy/Modules.am \
misc/logger/Modules.am \
......
SOURCES_wxwindows = \
modules/gui/wxwindows/wxwindows.cpp \
modules/gui/wxwindows/interface.cpp \
modules/gui/wxwindows/timer.cpp
noinst_HEADERS += \
modules/gui/wxwindows/wxwindows.h
EXTRA_DIST += \
modules/gui/wxwindows/bitmaps/file.xpm \
modules/gui/wxwindows/bitmaps/disc.xpm \
modules/gui/wxwindows/bitmaps/net.xpm \
modules/gui/wxwindows/bitmaps/stop.xpm \
modules/gui/wxwindows/bitmaps/play.xpm \
modules/gui/wxwindows/bitmaps/pause.xpm \
modules/gui/wxwindows/bitmaps/playlist.xpm \
modules/gui/wxwindows/bitmaps/previous.xpm \
modules/gui/wxwindows/bitmaps/next.xpm
/* XPM */
static char * disc_xpm[] = {
"24 24 138 2",
" c None",
". c #000000",
"+ c #AEB3B3",
"@ c #C6C9CD",
"# c #D7D4DF",
"$ c #ECDEF3",
"% c #E7CBE9",
"& c #D9B5D3",
"* c #B1B7A5",
"= c #B0B8AD",
"- c #B3B9B6",
"; c #C1C6C8",
"> c #D5D3DC",
", c #E5CAE6",
"' c #E0BBD7",
") c #E1ADC2",
"! c #E3ACA3",
"~ c #CAC1A4",
"{ c #C5C7AC",
"] c #B7BEAF",
"^ c #ADB4AF",
"/ c #BDC2C3",
"( c #D1D0D8",
"_ c #E5C7E4",
": c #E0B6D1",
"< c #E7A9B4",
"[ c #EDCDB6",
"} c #D6CFAE",
"| c #DFA79F",
"1 c #DDBFAA",
"2 c #CFC5A9",
"3 c #C1C4AC",
"4 c #B2BAAF",
"5 c #B6BBBB",
"6 c #CDCED4",
"7 c #E4C4E1",
"8 c #E0AFC7",
"9 c #EABCAE",
"0 c #E1D6B6",
"a c #C7CCAE",
"b c #A2AB9A",
"c c #E3ABC0",
"d c #E6A3A7",
"e c #DFBAA8",
"f c #BDC2AE",
"g c #E2BFDC",
"h c #E7D6B8",
"i c #ACB6A6",
"j c #9DA89F",
"k c #D9AFCF",
"l c #E1B4D2",
"m c #E2B0CB",
"n c #E4A9BB",
"o c #E2B2A6",
"p c #6A6A6A",
"q c #0D0D0D",
"r c #A6B1A3",
"s c #98A29C",
"t c #8F9796",
"u c #7E8485",
"v c #E8C6E7",
"w c #E5C2E3",
"x c #E3BDDD",
"y c #E1B6D5",
"z c #8B9092",
"A c #979EA2",
"B c #A0A7AE",
"C c #E7D3ED",
"D c #E8D1ED",
"E c #E8CEEC",
"F c #E9CCEB",
"G c #A7AEB7",
"H c #B2B6C5",
"I c #BABCCE",
"J c #BFBED3",
"K c #E9DFF0",
"L c #E1D2F7",
"M c #CAC7D2",
"N c #C5C4CD",
"O c #BFBFC7",
"P c #B8B9C0",
"Q c #AEAFB6",
"R c #D5A8E1",
"S c #D8B2E9",
"T c #D9B8ED",
"U c #DBBDF0",
"V c #DCBFF1",
"W c #A4A6AC",
"X c #A8AAAF",
"Y c #A0A6A8",
"Z c #989E9C",
"` c #A1A89E",
" . c #B1B6A1",
".. c #C08CAD",
"+. c #CC90B5",
"@. c #D394CA",
"#. c #D6A2DB",
"$. c #CFA7DF",
"%. c #989F9B",
"&. c #ACB3A0",
"*. c #B9B9A4",
"=. c #D0B8A8",
"-. c #C5B5B8",
";. c #B6BBAD",
">. c #E3D7B5",
",. c #DDB4A9",
"'. c #CB89AC",
"). c #C891B5",
"!. c #D18DB7",
"~. c #A1A798",
"{. c #BDB9A5",
"]. c #CAB5B7",
"^. c #B8B1B1",
"/. c #C2C8B2",
"(. c #E1BFAF",
"_. c #DB929A",
":. c #BE82A6",
"<. c #C891B4",
"[. c #C78BB0",
"}. c #BCB6A1",
"|. c #CDB6B7",
"1. c #C0B4B5",
"2. c #B1B1AA",
"3. c #CAD1B4",
"4. c #E2C1B0",
"5. c #DBA8A3",
"6. c #D28AA9",
"7. c #B77EA2",
"8. c #BD89A9",
"9. c #C9AFAF",
"0. c #D0D6B5",
"a. c #E2BFAF",
"b. c #C684A7",
"c. c #ACAAA6",
"d. c #BDC3B0",
"e. c #D2D7B5",
"f. c #E2BFAE",
"g. c #DBB6A8",
" ",
" ",
" ",
" . . . . . . ",
" . . + @ # $ % & . . ",
" . * = - ; > $ , ' ) ! . ",
" . ~ { ] ^ / ( $ _ : < [ } . ",
" . | 1 2 3 4 5 6 $ 7 8 9 0 a b . ",
" . c d e 2 f ^ @ $ g < h a i j . ",
" . k l m n o 2 p q q p [ a r s t u . ",
" . v w x y m p . . p j t z A B . ",
" . C D E F v q q A G H I J . ",
" . K K K K K q q L L L L L . ",
" . M N O P Q p . . p R S T U V . ",
" . W X Y Z ` .p q q p ..+.@.#.R $.. ",
" . %.` &.*.=.-.;.>.,.'...).!.@.. ",
" . ~. .{.=.].^./.>.(._.:...<.[.. ",
" . }.=.|.1.2.3.>.4.5.6.7.8.. ",
" . 9.-.^.;.0.>.a.,._.b.. ",
" . . c.d.e.>.f.g.. . ",
" . . . . . . ",
" ",
" ",
" "};
/* XPM */
static char * file_xpm[] = {
"24 24 54 1",
" c None",
". c #000000",
"+ c #0B0B0B",
"@ c #A4946F",
"# c #131313",
"$ c #FEFEF7",
"% c #FFFFFF",
"& c #C0B59C",
"* c #D5CEBD",
"= c #C4BAA2",
"- c #EFEDE7",
"; c #C5BBA4",
"> c #C5BBA3",
", c #E9E5DC",
"' c #D4CDBC",
") c #AD9E7D",
"! c #A99A77",
"~ c #DAD4C5",
"{ c #F1EEE8",
"] c #B5A88A",
"^ c #AFA281",
"/ c #A59671",
"( c #D5CDBC",
"_ c #EBE8E0",
": c #ECE8E0",
"< c #CBC2AD",
"[ c #B9AD91",
"} c #B8AC8F",
"| c #AA9B78",
"1 c #F3F1EC",
"2 c #C7BDA6",
"3 c #B7AA8D",
"4 c #B5A98B",
"5 c #B4A789",
"6 c #AB9C7B",
"7 c #D7D1C1",
"8 c #B7AB8E",
"9 c #B6A98C",
"0 c #B8AB8E",
"a c #685E46",
"b c #B3A688",
"c c #B1A484",
"d c #A89975",
"e c #938463",
"f c #D2CAB8",
"g c #B4A788",
"h c #CFC7B3",
"i c #AEA07F",
"j c #A79875",
"k c #7D7155",
"l c #C1B69D",
"m c #A79774",
"n c #8B7D5E",
"o c #A0906C",
" ",
" ",
" ",
" ",
" ",
" .. ",
" +..@@. ",
" .. .#.@@@@$$%... ",
" .@@..@@@@$$$$..&*. ",
" .@@@@@$$$$$..=-;@. ",
" .@@$$$$$..>,')!@. ",
" .@@$$$..~{~]]^/@. ",
" .@$$.(_:<[})|@@. ",
" .@@$.12[3456@@@. ",
" .@$.78]90)@@@a. ",
" .@@.*]b9cd@e.. ",
" .@.f]]g|@.. ",
" .@.h4ijk. ",
" ..lmn.. ",
" ..o.. ",
" .. ",
" ",
" ",
" "};
/* XPM */
static char * net_xpm[] = {
"24 24 30 1",
" c None",
". c #272727",
"+ c #888888",
"@ c #B0A5BA",
"# c #7E6792",
"$ c #3C284D",
"% c #B8B0C1",
"& c #87709D",
"* c #70518A",
"= c #6C4C85",
"- c #65477C",
"; c #513663",
"> c #856E99",
", c #4B365F",
"' c #573E6D",
") c #483259",
"! c #372544",
"~ c #4B335C",
"{ c #776684",
"] c #A898B5",
"^ c #857991",
"/ c #8A759B",
"( c #747474",
"_ c #9C89AA",
": c #4D3663",
"< c #A095AC",
"[ c #65477E",
"} c #7A5695",
"| c #826A97",
"1 c #412D52",
" ",
" ",
" ",
" ",
" . ",
" .+ ",
" .@#..$ ",
" .%&**=-;. ",
" .>*.$,--. ",
" . .. $'). ",
" . . !'. ",
" .. ~! ",
" !{ !. ",
" .]. . . ",
" .^/. (. . ",
" ._=:!.<[. ",
" !:**}|=*. ",
" 1!.=-. ",
" .. ",
" . ",
" ",
" ",
" ",
" "};
/* XPM */
static char * next_xpm[] = {
"24 24 52 1",
" c None",
". c #000000",
"+ c #F7F7F7",
"@ c #CBD6CA",
"# c #BECEBA",
"$ c #E7EFE7",
"% c #ACC8A9",
"& c #EBF2EA",
"* c #77A16E",
"= c #E3EBE2",
"- c #709867",
"; c #F8F8F7",
"> c #F1F5F0",
", c #ECF2EB",
"' c #E5EEE3",
") c #E0EBDF",
"! c #D8E6D6",
"~ c #C6D9C2",
"{ c #C5D7C3",
"] c #B2CBB0",
"^ c #AAC7A8",
"/ c #0F1308",
"( c #DDE6DB",
"_ c #AEC8AD",
": c #ABC7A8",
"< c #AAC6A7",
"[ c #A8C6A5",
"} c #ADC8AD",
"| c #A8C7A8",
"1 c #A5C4A3",
"2 c #7F9F76",
"3 c #D6E1D4",
"4 c #ABC7AA",
"5 c #A7C5A4",
"6 c #A9C7A6",
"7 c #AFC8AD",
"8 c #A4C3A2",
"9 c #6B9060",
"0 c #E4ECE3",
"a c #A7B6A2",
"b c #698D60",
"c c #6B9063",
"d c #445B2C",
"e c #9FB79B",
"f c #9FB199",
"g c #5B7950",
"h c #95A88F",
"i c #9FAF99",
"j c #789171",
"k c #506B46",
"l c #889D7F",
"m c #475E3E",
" ",
" ",
" ",
" . .... ",
" .. .+@. ",
" .#. .$%. ",
" .&*. .$%. ",
" ........=%-. .$%. ",
" .;>,')!~{]^-/ .$%. ",
" .(_:::<[^}|12. .$%. ",
" .34[5[6:%^:789. .0%. ",
" .abccccccccccbd..ec. ",
" .fgggggggggggd. .hg. ",
" .iggggggggggd. .hg. ",
" .jkkkkkkgggd. .hg. ",
" ........kgd. .hg. ",
" .kd. .hg. ",
" .d. .hg. ",
" .. .lm. ",
" . .... ",
" ",
" ",
" ",
" "};
/* XPM */
static char * pause_xpm[] = {
"24 24 48 1",
" c None",
". c #000000",
"+ c #C1D6BD",
"@ c #AEC5A8",
"# c #A6BFA0",
"$ c #778E6F",
"% c #6B8661",
"& c #6C8562",
"* c #65815C",
"= c #BDD3B8",
"- c #AEC8AD",
"; c #ABC7AA",
"> c #698D60",
", c #5B7950",
"' c #506B46",
") c #BFD4BB",
"! c #ABC7A8",
"~ c #A8C6A5",
"{ c #6B9063",
"] c #C2D7BE",
"^ c #A7C5A4",
"/ c #AAC6A7",
"( c #A9C7A6",
"_ c #8CA782",
": c #B1CDAE",
"< c #B4CEB1",
"[ c #B0CAAD",
"} c #AAC7A8",
"| c #ACC8A9",
"1 c #445B2C",
"2 c #77A16E",
"3 c #B2CBB0",
"4 c #ADC8AD",
"5 c #709867",
"6 c #A8C7A8",
"7 c #A5C4A3",
"8 c #AFC8AD",
"9 c #0F1308",
"0 c #7F9F76",
"a c #A4C3A2",
"b c #6B9060",
"c c #F3F3F3",
"d c #C9DBC7",
"e c #9FB79B",
"f c #95A88F",
"g c #889D7F",
"h c #C7D3C6",
"i c #475E3E",
" ",
" ",
" ......... ",
" .+@#$%&*. ",
" .=-;>,,'. ",
" .)!~{,,'. ",
" .]!^{,,'. ",
" .]!~{,,'. ",
" .]/({,,'. ",
" .....]~!{,,'..... ",
" ._:<[}|{,,,''1. ",
" .2|34}{,,,,1. ",
" .5}6!{,,,1. ",
" .578{,,1. ",
" 90a{,1. ",
" .b>1. ",
" .1. ",
" . ",
" ................. ",
" .cddddddeffffffg. ",
" .h||||||{,,,,,,i. ",
" ................. ",
" ",
" "};
/* XPM */
static char * play_xpm[] = {
"24 24 41 1",
" c None",
". c #000000",
"+ c #8CA782",
"@ c #B1CDAE",
"# c #77A16E",
"$ c #B4CEB1",
"% c #ACC8A9",
"& c #709867",
"* c #C1D6BD",
"= c #BDD3B8",
"- c #BFD4BB",
"; c #C2D7BE",
"> c #B0CAAD",
", c #B2CBB0",
"' c #AAC7A8",
") c #0F1308",
"! c #AEC5A8",
"~ c #AEC8AD",
"{ c #ABC7A8",
"] c #AAC6A7",
"^ c #A8C6A5",
"/ c #ADC8AD",
"( c #A8C7A8",
"_ c #A5C4A3",
": c #7F9F76",
"< c #A6BFA0",
"[ c #ABC7AA",
"} c #A7C5A4",
"| c #A9C7A6",
"1 c #AFC8AD",
"2 c #A4C3A2",
"3 c #6B9060",
"4 c #778E6F",
"5 c #698D60",
"6 c #6B9063",
"7 c #445B2C",
"8 c #6B8661",
"9 c #5B7950",
"0 c #6C8562",
"a c #65815C",
"b c #506B46",
" ",
" ",
" ",
" . ",
" .. ",
" .+. ",
" .@#. ",
" ........$%&. ",
" .*=-;;;;>,'&) ",
" .!~{{{]^'/(_:. ",
" .<[^}^|{%'{123. ",
" .45666666666657. ",
" .8999999999997. ",
" .099999999997. ",
" .abbbbbb9997. ",
" ........b97. ",
" .b7. ",
" .7. ",
" .. ",
" . ",
" ",
" ",
" ",
" "};