Skip to content

V
vlc-1.1
Commit a0249c48 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options 

  * ./configure.in: wrote a better test for libdvdread detection.
  * ./plugins/gtk/gtk.glade: added lines this #@%$! Glade had munched, fixes
    a segfault in the Gtk+ popup menu when toggling the interface.
  * ./plugins/motion/motion.c: fixed a compilation issue on compilers which
    do not accept empty macro arguments.
parent b2f75d5c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 156 deletions
ChangeLog
View file @ a0249c48
......@@ -4,7 +4,11 @@
HEAD
* Nothing yet.
* ./configure.in: wrote a better test for libdvdread detection.
* ./plugins/gtk/gtk.glade: added lines this #@%$! Glade had munched, fixes
a segfault in the Gtk+ popup menu when toggling the interface.
* ./plugins/motion/motion.c: fixed a compilation issue on compilers which
do not accept empty macro arguments.
0.3.0
Sat, 6 Apr 2002 04:27:50 +0200
......
configure
View file @ a0249c48
This diff is collapsed.
configure.in
View file @ a0249c48
......@@ -108,7 +108,7 @@ else
fi
dnl The -DSYS_FOO flag
save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr '[a-z].' '[A-Z]_'`"
save_CFLAGS="${save_CFLAGS} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"
dnl Check for system libs needed
AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol isatty usleep vasprintf swab sigrelse getpwuid memalign posix_memalign)
......@@ -645,26 +645,39 @@ if test "x$enableval" != "xno"
then
AC_ARG_WITH(dvdread,
[ --with-dvdread=PATH libdvdread headers and libraries])
case "x$with_dvdread" in
x)
AC_CHECK_HEADERS(dvdread/dvd_reader.h,
[ PLUGINS="${PLUGINS} dvdread"
dvdread_LDFLAGS="${dvdread_LDFLAGS} -ldvdread" ])
;;
*)
AC_MSG_CHECKING(for dvdread headers in ${withval})
if test -f ${withval}/include/dvdread/dvd_reader.h
if test "x$withval" = x
then
test_LDFLAGS=""
test_CFLAGS=""
else
test_LDFLAGS="-L${withval}/lib"
test_CFLAGS="-I${withval}/include"
fi
CPPFLAGS="$save_CPPFLAGS $test_CFLAGS"
AC_CHECK_HEADERS(dvdread/dvd_reader.h, [
AC_TRY_COMPILE([#include <dvdread/dvd_reader.h>],
[void foo() { int i=DVD_VIDEO_LB_LEN; }],[
PLUGINS="${PLUGINS} dvdread"
dvdread_LDFLAGS="${dvdread_LDFLAGS} ${test_LDFLAGS} -ldvdread"
dvdread_CFLAGS="${dvdread_CFLAGS} ${test_CFLAGS}"
],[
if test "x$enableval" != x
then
AC_MSG_ERROR([Cannot find DVD_VIDEO_LB_LEN in dvdread/dvd_reader.h, please install libdvdread version 0.9.2 or later])
fi
])
],[
if test "x$enableval" != x
then
AC_MSG_RESULT(yes)
PLUGINS="${PLUGINS} dvdread"
dvdread_LDFLAGS="${dvdread_LDFLAGS} -L${withval}/lib -ldvdread"
dvdread_CFLAGS="${dvdread_CFLAGS} -I${withval}/include"
else
AC_MSG_RESULT(no)
AC_MSG_ERROR([Cannot find ${withval}/dvdread/dvd_reader.h])
if test "x$withval" != x
then
AC_MSG_ERROR([Cannot find dvdread/dvd_reader.h in ${withval}/include])
else
AC_MSG_ERROR([Cannot find dvdread/dvd_reader.h])
fi
fi
;;
esac
])
CPPFLAGS="$save_CPPFLAGS"
fi
dnl
......
plugins/gtk/gtk.glade
View file @ a0249c48
......@@ -1026,6 +1026,7 @@
<signal>
<name>activate</name>
<handler>GtkPlayActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:53:43 GMT</last_modification_time>
</signal>
<label>_Play</label>
......@@ -1039,6 +1040,7 @@
<signal>
<name>activate</name>
<handler>GtkPauseActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:53:37 GMT</last_modification_time>
</signal>
<label>Pause</label>
......@@ -1051,6 +1053,7 @@
<signal>
<name>activate</name>
<handler>GtKStopActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:53:29 GMT</last_modification_time>
</signal>
<label>Stop</label>
......@@ -1064,6 +1067,7 @@
<signal>
<name>activate</name>
<handler>GtkBackActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:53:21 GMT</last_modification_time>
</signal>
<label>Back</label>
......@@ -1077,6 +1081,7 @@
<signal>
<name>activate</name>
<handler>GtkSlowActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:53:15 GMT</last_modification_time>
</signal>
<label>Slow</label>
......@@ -1090,6 +1095,7 @@
<signal>
<name>activate</name>
<handler>GtkFastActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:53:07 GMT</last_modification_time>
</signal>
<label>Fast</label>
......@@ -1108,6 +1114,7 @@
<signal>
<name>activate</name>
<handler>GtkWindowToggleActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:53:00 GMT</last_modification_time>
</signal>
<label>Toggle _Interface</label>
......@@ -1120,6 +1127,7 @@
<signal>
<name>activate</name>
<handler>GtkFullscreenActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:52:38 GMT</last_modification_time>
</signal>
<label>_Fullscreen</label>
......@@ -1138,6 +1146,7 @@
<signal>
<name>activate</name>
<handler>GtkNextActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:52:31 GMT</last_modification_time>
</signal>
<label>Next</label>
......@@ -1150,6 +1159,7 @@
<signal>
<name>activate</name>
<handler>GtkPrevActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:52:23 GMT</last_modification_time>
</signal>
<label>Prev</label>
......@@ -1162,6 +1172,7 @@
<signal>
<name>activate</name>
<handler>GtkJumpActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:52:13 GMT</last_modification_time>
</signal>
<label>_Jump...</label>
......@@ -1217,6 +1228,7 @@
<signal>
<name>activate</name>
<handler>GtkFileOpenActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:33:55 GMT</last_modification_time>
</signal>
<label>_Open File...</label>
......@@ -1230,6 +1242,7 @@
<signal>
<name>activate</name>
<handler>GtkDiscOpenActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:34:09 GMT</last_modification_time>
</signal>
<label>Open _Disc...</label>
......@@ -1243,6 +1256,7 @@
<signal>
<name>activate</name>
<handler>GtkNetworkOpenActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:34:23 GMT</last_modification_time>
</signal>
<label>_Network Stream...</label>
......@@ -1261,6 +1275,7 @@
<signal>
<name>activate</name>
<handler>GtkAboutActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Mon, 14 May 2001 21:34:54 GMT</last_modification_time>
</signal>
<label>_About...</label>
......@@ -1275,6 +1290,7 @@
<signal>
<name>activate</name>
<handler>GtkPlaylistActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:51:55 GMT</last_modification_time>
</signal>
<label>Playlist...</label>
......@@ -1287,6 +1303,7 @@
<signal>
<name>activate</name>
<handler>GtkPreferencesActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:51:46 GMT</last_modification_time>
</signal>
<label>_Preferences...</label>
......@@ -1305,6 +1322,7 @@
<signal>
<name>activate</name>
<handler>GtkExitActivate</handler>
<data>&quot;intf_popup&quot;</data>
<last_modification_time>Tue, 15 May 2001 13:52:03 GMT</last_modification_time>
</signal>
<label>E_xit</label>
......
plugins/gtk/gtk_interface.c
View file @ a0249c48
......@@ -1245,58 +1245,58 @@ create_intf_popup (void)
gtk_signal_connect (GTK_OBJECT (popup_play), "activate",
GTK_SIGNAL_FUNC (GtkPlayActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_pause), "activate",
GTK_SIGNAL_FUNC (GtkPauseActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_stop), "activate",
GTK_SIGNAL_FUNC (GtKStopActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_back), "activate",
GTK_SIGNAL_FUNC (GtkBackActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_slow), "activate",
GTK_SIGNAL_FUNC (GtkSlowActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_fast), "activate",
GTK_SIGNAL_FUNC (GtkFastActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_interface_toggle), "activate",
GTK_SIGNAL_FUNC (GtkWindowToggleActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_fullscreen), "activate",
GTK_SIGNAL_FUNC (GtkFullscreenActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_next), "activate",
GTK_SIGNAL_FUNC (GtkNextActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_prev), "activate",
GTK_SIGNAL_FUNC (GtkPrevActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_jump), "activate",
GTK_SIGNAL_FUNC (GtkJumpActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_file), "activate",
GTK_SIGNAL_FUNC (GtkFileOpenActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_disc), "activate",
GTK_SIGNAL_FUNC (GtkDiscOpenActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_network), "activate",
GTK_SIGNAL_FUNC (GtkNetworkOpenActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_about), "activate",
GTK_SIGNAL_FUNC (GtkAboutActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_playlist), "activate",
GTK_SIGNAL_FUNC (GtkPlaylistActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_preferences), "activate",
GTK_SIGNAL_FUNC (GtkPreferencesActivate),
NULL);
"intf_popup");
gtk_signal_connect (GTK_OBJECT (popup_exit), "activate",
GTK_SIGNAL_FUNC (GtkExitActivate),
NULL);
"intf_popup");
gtk_object_set_data (GTK_OBJECT (intf_popup), "tooltips", tooltips);
......
plugins/motion/motion.c
View file @ a0249c48
......@@ -2,7 +2,7 @@
* motion.c : C motion compensation module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: motion.c,v 1.14 2002/02/15 13:32:53 sam Exp $
* $Id: motion.c,v 1.15 2002/04/07 06:48:48 sam Exp $
*
* Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* Michel Lespinasse <walken@zoy.org>
......@@ -62,7 +62,7 @@ MODULE_DEACTIVATE_STOP
#define avg2(a,b) ((a+b+1)>>1)
#define avg4(a,b,c,d) ((a+b+c+d+2)>>2)
#define predict_(i) (ref[i])
#define predict_o(i) (ref[i])
#define predict_x(i) (avg2 (ref[i], ref[i+1]))
#define predict_y(i) (avg2 (ref[i], (ref+stride)[i]))
#define predict_xy(i) (avg4 (ref[i], ref[i+1], (ref+stride)[i], (ref+stride)[i+1]))
......@@ -72,7 +72,7 @@ MODULE_DEACTIVATE_STOP
// mc function template
#define MC_FUNC(op,xy) \
#define MC_FUNC(op,xy) \
static void MC_##op##_##xy##16_c (yuv_data_t * dest, yuv_data_t * ref, \
int stride, int height) \
{ \
......@@ -116,8 +116,8 @@ static void MC_##op##_##xy##8_c (yuv_data_t * dest, yuv_data_t * ref, \
// definitions of the actual mc functions
MC_FUNC (put,)
MC_FUNC (avg,)
MC_FUNC (put,o)
MC_FUNC (avg,o)
MC_FUNC (put,x)
MC_FUNC (avg,x)
MC_FUNC (put,y)
......@@ -138,22 +138,22 @@ static void motion_getfunctions( function_list_t * p_function_list )
/* Copying functions */
{
/* Width == 16 */
MC_put_16_c, MC_put_x16_c, MC_put_y16_c, MC_put_xy16_c
MC_put_o16_c, MC_put_x16_c, MC_put_y16_c, MC_put_xy16_c
},
{
/* Width == 8 */
MC_put_8_c, MC_put_x8_c, MC_put_y8_c, MC_put_xy8_c
MC_put_o8_c, MC_put_x8_c, MC_put_y8_c, MC_put_xy8_c
}
},
{
/* Averaging functions */
{
/* Width == 16 */
MC_avg_16_c, MC_avg_x16_c, MC_avg_y16_c, MC_avg_xy16_c
MC_avg_o16_c, MC_avg_x16_c, MC_avg_y16_c, MC_avg_xy16_c
},
{
/* Width == 8 */
MC_avg_8_c, MC_avg_x8_c, MC_avg_y8_c, MC_avg_xy8_c
MC_avg_o8_c, MC_avg_x8_c, MC_avg_y8_c, MC_avg_xy8_c
}
}
};
......
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