toxine-cvs Mailing List for toxine (Page 12)
Brought to you by:
f1rmb
Menu
▾
▴
toxine-cvs — CVS log mailing list
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
(19) |
Jul
(81) |
Aug
(18) |
Sep
(38) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(24) |
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(23) |
May
(36) |
Jun
(7) |
Jul
(29) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-24 21:47:37
|
Update of /cvsroot/toxine/toxine In directory usw-pr-cvs1:/tmp/cvs-serv10861 Modified Files: ChangeLog Makefile.am configure.in Log Message: 0.4.0 release. Index: ChangeLog =================================================================== RCS file: /cvsroot/toxine/toxine/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ChangeLog 21 Jun 2002 13:36:30 -0000 1.2 +++ ChangeLog 24 Jun 2002 21:47:34 -0000 1.3 @@ -1,3 +1,11 @@ +2002-06-24 Monday 23:35 f1rmb + + more checks for release. Need 0.9.12. + +2002-06-21 Friday 15:36 f1rmb + + Add Changelog support. + 2002-06-21 Friday 15:14 f1rmb Fixed missposition (X/Y) report on fullscreen->window mode. Index: Makefile.am =================================================================== RCS file: /cvsroot/toxine/toxine/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.am 24 Jun 2002 21:35:05 -0000 1.3 +++ Makefile.am 24 Jun 2002 21:47:34 -0000 1.4 @@ -44,6 +44,10 @@ @mv -f .cvsversion.tmp .cvsversion +upload: + lftp -u anonymous upload.sourceforge.net -e "cd incoming; mput $(distdir).tar.gz" + + mostlyclean-generic: -rm -f *~ \#* .*~ .\#* -rm -f $(PACKAGE)_$(VERSION).tar.gz Index: configure.in =================================================================== RCS file: /cvsroot/toxine/toxine/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- configure.in 24 Jun 2002 21:35:05 -0000 1.9 +++ configure.in 24 Jun 2002 21:47:34 -0000 1.10 @@ -17,7 +17,7 @@ dnl 0.2.0 was never released dnl switch directly to 0.3.0 since toxine have is own project site. TOXINE_MAJOR=0 -TOXINE_MINOR=3 +TOXINE_MINOR=4 TOXINE_SUB=0 TOXINE_PRE="`if test -f ./.cvsversion; then echo cvs;fi`" |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-24 21:35:08
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv3441/src
Modified Files:
main.c
Log Message:
more checks for release. Need 0.9.12.
Index: main.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.c 3 Jun 2002 21:26:10 -0000 1.2
+++ main.c 24 Jun 2002 21:35:05 -0000 1.3
@@ -131,8 +131,8 @@
int i;
/* Check xine library version */
- if(!xine_check_version(0, 9, 10)) {
- fprintf(stderr, "Require xine library version 0.9.10, found %d.%d.%d.\n",
+ if(!xine_check_version(0, 9, 12)) {
+ fprintf(stderr, "Require xine library version 0.9.12, found %d.%d.%d.\n",
xine_get_major_version(), xine_get_minor_version(),
xine_get_sub_version());
exit(1);
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-24 21:35:08
|
Update of /cvsroot/toxine/toxine In directory usw-pr-cvs1:/tmp/cvs-serv3441 Modified Files: Makefile.am configure.in Log Message: more checks for release. Need 0.9.12. Index: Makefile.am =================================================================== RCS file: /cvsroot/toxine/toxine/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.am 21 Jun 2002 13:36:30 -0000 1.2 +++ Makefile.am 24 Jun 2002 21:35:05 -0000 1.3 @@ -32,6 +32,18 @@ cvs2cl.pl --fsf --hide-filenames --prune --day-of-week --ignore ChangeLog +release-check: misc/relchk.sh + @mv -f .cvsversion .cvsversion.tmp + @./configure && $(SHELL) misc/relchk.sh + @mv -f .cvsversion.tmp .cvsversion + + +release: release-check + @mv -f .cvsversion .cvsversion.tmp + ./configure && $(MAKE) distcheck + @mv -f .cvsversion.tmp .cvsversion + + mostlyclean-generic: -rm -f *~ \#* .*~ .\#* -rm -f $(PACKAGE)_$(VERSION).tar.gz Index: configure.in =================================================================== RCS file: /cvsroot/toxine/toxine/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- configure.in 21 Jun 2002 13:14:59 -0000 1.8 +++ configure.in 24 Jun 2002 21:35:05 -0000 1.9 @@ -87,7 +87,7 @@ dnl dnl Check for xine-lib dnl -AM_PATH_XINE(0.9.10,, AC_MSG_ERROR(*** You should install xine-lib first ***)) +AM_PATH_XINE(0.9.12,, AC_MSG_ERROR(*** You should install xine-lib first ***)) dnl @@ -449,11 +449,12 @@ AC_OUTPUT([ Makefile misc/Makefile +misc/relchk.sh readline/Makefile m4/Makefile src/Makefile src/plugins/Makefile -]) +],[chmod +x ./misc/relchk.sh]) dnl ,[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh]) dnl |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-24 21:35:08
|
Update of /cvsroot/toxine/toxine/misc
In directory usw-pr-cvs1:/tmp/cvs-serv3441/misc
Modified Files:
Makefile.am
Added Files:
relchk.sh.in
Log Message:
more checks for release. Need 0.9.12.
--- NEW FILE: relchk.sh.in ---
#!/bin/sh
##
## A simple compare directory content utility.
##
topdir="`pwd`"
distdir="@TAR_NAME@"
log="$topdir/dist-log"
logerror="$topdir/dist-errors"
getdir() {
for file in `ls`; do
if test -d $file -a $file != "CVS" -a $file != $distdir; then
(cd $file && getdir) || (cd ..)
else
if test ! -d $file -a \
$file != $log -a \
$file != $logerror -a \
$file != "CVS" -a \
$file != ${0##*/} -a \
$file != "$distdir.tar.gz"; then
orifile=`pwd`/$file
distfile=$topdir/$distdir${orifile##*$topdir}
echo -e "check:\t$orifile\nand\t$distfile" >> $log
if test ! -e $distfile; then
missingfile=${orifile##$topdir}
echo "${missingfile#/} is missing in tarball" >> $logerror
fi
fi
fi
done
}
main() {
rm -f $log $logerror
echo "--- Log start <`date +%c`> ---" > $log
echo "--- Log error start <`date +%c`> ---" > $logerror
./cvscompile.sh $CONFIG_ARGS && make dist && mv $distdir.tar.gz $distdir.tmp.tar.gz
make clean && make distclean && mv $distdir.tmp.tar.gz $distdir.tar.gz
tar -xzf $distdir.tar.gz
echo "Check is running, be patient..."
getdir
rm -rf $distdir
rm -f $distdir.tar.gz
echo "--- Log end <`date +%c`> ---" >> $log
echo "--- Log error end <`date +%c`> ---" >> $logerror
echo " * Log is ${log##*/}"
echo " * Error log is ${logerror##*/}"
}
main
Index: Makefile.am
===================================================================
RCS file: /cvsroot/toxine/toxine/misc/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.am 13 May 2002 20:45:37 -0000 1.1.1.1
+++ Makefile.am 24 Jun 2002 21:35:05 -0000 1.2
@@ -4,6 +4,8 @@
debug:
install-debug: debug
+relchk.sh:
+
mostlyclean-generic:
-rm -f *~ \#* .*~ .\#*
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-21 13:36:35
|
Update of /cvsroot/toxine/toxine In directory usw-pr-cvs1:/tmp/cvs-serv9354 Modified Files: ChangeLog Makefile.am Log Message: Add Changelog support. Index: ChangeLog =================================================================== RCS file: /cvsroot/toxine/toxine/ChangeLog,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- ChangeLog 13 May 2002 20:45:28 -0000 1.1.1.1 +++ ChangeLog 21 Jun 2002 13:36:30 -0000 1.2 @@ -0,0 +1,62 @@ +2002-06-21 Friday 15:14 f1rmb + + Fixed missposition (X/Y) report on fullscreen->window mode. + Backport fake events (no more kill xscreensaver/deactivate X + ScreenSaver. + +2002-06-21 Friday 10:57 f1rmb + + Add get/set video fullscreen. + +2002-06-13 Thursday 14:06 f1rmb + + Remove no more available XINE_LOGO engine status. + +2002-06-03 Monday 23:26 f1rmb + + Require 0.9.10. + +2002-06-03 Monday 21:48 f1rmb + + ML test. + +2002-06-03 Monday 16:53 f1rmb + + Add vidix support (via X11). call xine_exit() on quit (avoid vidix + DGA stays). + +2002-05-23 Thursday 21:46 f1rmb + + change printf() to perr(). + +2002-05-21 Tuesday 00:11 f1rmb + + test + +2002-05-21 Tuesday 00:04 f1rmb + + test + +2002-05-20 Monday 23:56 f1rmb + + CVS log test. + +2002-05-20 Monday 18:14 f1rmb + + in command execution mode, 'quit' is now required, otherwise after + commands execution, toxine fall in interactive mode. This is useful + when we won't use script mode, but take advantage of command line + (reproducibility). + +2002-05-14 Tuesday 09:03 f1rmb + + Fix typo. + +2002-05-13 Monday 22:45 f1rmb + + Initial revision + +2002-05-13 Monday 22:45 f1rmb + + Initial import into CVS + Index: Makefile.am =================================================================== RCS file: /cvsroot/toxine/toxine/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile.am 13 May 2002 20:45:35 -0000 1.1.1.1 +++ Makefile.am 21 Jun 2002 13:36:30 -0000 1.2 @@ -10,19 +10,26 @@ CONFIG_CLEAN_FILES = libtool-nofpic + debug: @list='$(SUBDIRS)'; for subdir in $$list; do \ (cd $$subdir && $(MAKE) $@) || exit; \ done; $(MAKE) CFLAGS="$(DEBUG_CFLAGS)" + install-debug: debug @list='$(SUBDIRS)'; for subdir in $$list; do \ (cd $$subdir && $(MAKE) $@) || exit; \ done; + prune-cache: -rm -f config.cache + + +changelog: + cvs2cl.pl --fsf --hide-filenames --prune --day-of-week --ignore ChangeLog mostlyclean-generic: |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-21 13:15:07
|
Update of /cvsroot/toxine/toxine In directory usw-pr-cvs1:/tmp/cvs-serv1429 Modified Files: acconfig.h configure.in Log Message: Fixed missposition (X/Y) report on fullscreen->window mode. Backport fake events (no more kill xscreensaver/deactivate X ScreenSaver. Index: acconfig.h =================================================================== RCS file: /cvsroot/toxine/toxine/acconfig.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- acconfig.h 13 May 2002 20:45:35 -0000 1.1.1.1 +++ acconfig.h 21 Jun 2002 13:14:59 -0000 1.2 @@ -20,6 +20,9 @@ /* Define this if you have X11R6 installed */ #undef HAVE_X11 +/* Define this if you have libXtst installed */ +#undef HAVE_XTESTEXTENSION + /* Define this if you have GNU getopt_long() implemented */ #undef HAVE_GETOPT_LONG @@ -68,8 +71,6 @@ /* Define if you have the lstat function. */ #undef HAVE_LSTAT /* End of readline section */ - -#undef HAVE_DPMS @BOTTOM@ #endif Index: configure.in =================================================================== RCS file: /cvsroot/toxine/toxine/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- configure.in 3 Jun 2002 21:26:10 -0000 1.7 +++ configure.in 21 Jun 2002 13:14:59 -0000 1.8 @@ -132,16 +132,14 @@ fi dnl -dnl Check for DPMS location +dnl XTest Extension dnl -AC_CHECK_LIB(Xext, DPMSQueryExtension, - DPMS_LIBS="" - AC_DEFINE(HAVE_DPMS), - AC_CHECK_LIB(Xdpms, DPMSQueryExtension, - DPMS_LIBS="-lXdpms" - AC_DEFINE(HAVE_DPMS),, $X_LIBS), - $X_LIBS) -AC_SUBST(DPMS_LIBS) +AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, + XTEST_LIBS="-lXtst" + AC_DEFINE(HAVE_XTESTEXTENSION) + ac_have_xtest="yes",, $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS) +AC_SUBST(XTEST_LIBS) +AM_CONDITIONAL(HAVE_XTESTEXTENSION, test x$ac_have_xtest = "xyes") AC_CHECK_HEADER(stdarg.h, AC_DEFINE(HAVE_STDARGS)) AC_CHECK_HEADERS(string.h strings.h alloca.h) |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-21 13:15:07
|
Update of /cvsroot/toxine/toxine/src/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv1429/src/plugins
Modified Files:
Makefile.am vo_x11.c
Removed Files:
xscreensaver-remote.c xscreensaver-remote.h
Log Message:
Fixed missposition (X/Y) report on fullscreen->window mode.
Backport fake events (no more kill xscreensaver/deactivate X ScreenSaver.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.am 13 May 2002 20:46:45 -0000 1.1.1.1
+++ Makefile.am 21 Jun 2002 13:14:59 -0000 1.2
@@ -14,8 +14,8 @@
lib_LTLIBRARIES = $(aa_plugin) toxine_vo_plugin_x11.la toxine_vo_plugin_dxr3.la
-toxine_vo_plugin_x11_la_SOURCES = vo_x11.c xscreensaver-remote.c
-toxine_vo_plugin_x11_la_LDFLAGS = -avoid-version -module $(X_LIBS) $(DPMS_LIBS) \
+toxine_vo_plugin_x11_la_SOURCES = vo_x11.c
+toxine_vo_plugin_x11_la_LDFLAGS = -avoid-version -module $(X_LIBS) $(XTEST_LIBS) \
-lX11 -lm -lXext $(X_EXTRA_LIBS)
toxine_vo_plugin_aa_la_SOURCES = vo_aa.c
@@ -24,7 +24,7 @@
toxine_vo_plugin_dxr3_la_SOURCES = vo_dxr3.c
toxine_vo_plugin_dxr3_la_LDFLAGS = -avoid-version -module
-noinst_HEADERS = vo_plugin.h xscreensaver-remote.h
+noinst_HEADERS = vo_plugin.h
debug:
@$(MAKE) CFLAGS="$(DEBUG_CFLAGS)"
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_x11.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vo_x11.c 21 Jun 2002 08:57:25 -0000 1.3
+++ vo_x11.c 21 Jun 2002 13:14:59 -0000 1.4
@@ -28,6 +28,7 @@
#include <errno.h>
#include <sys/types.h>
#include <signal.h>
+#include <time.h>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
@@ -36,12 +37,11 @@
#include <X11/keysym.h>
#include <X11/cursorfont.h>
#include <X11/extensions/XShm.h>
-#ifdef HAVE_DPMS
-# include <X11/extensions/dpms.h>
+#ifdef HAVE_XTESTEXTENSION
+#include <X11/extensions/XTest.h>
#endif
#include "common.h"
-#include "xscreensaver-remote.h"
#include <xine/video_out_x11.h>
@@ -61,35 +61,6 @@
uint32_t status;
} MWMHints;
-/*
- * Screensavers parameters
- */
-typedef struct {
- /* XFree86 */
- struct {
- int timeout;
- int interval;
- int prefer_blanking;
- int allow_exposures;
- } screensaver;
-
- /* Jamie's Zawinski xscreensaver */
- struct {
- int was_running;
- } xscreensaver;
-
-#ifdef HAVE_DPMS
- /* XFree DPMS */
- struct {
- int was_running;
- CARD16 standby;
- CARD16 suspend;
- CARD16 off;
- CARD16 level;
- } xdpms;
-#endif
-} screen_savers_t;
-
typedef struct {
Window video_window;
GC gc;
@@ -107,24 +78,28 @@
typedef struct {
Display *display;
-
+
int fullscreen;
x11_drawable_t x11_drawable[2];
-
+
cursors_t cursor;
-
+
int screen;
XColor black, white;
int completion_event;
Visual *visual;
Colormap colormap;
int depth;
-
+
XWMHints *wm_hint;
- screen_savers_t screen_savers;
- pthread_t timed_thread;
+ Bool have_xtest;
+#ifdef HAVE_XTESTEXTENSION
+ KeyCode fake_key; /* Fake key to send */
+#endif
+ pthread_t timed_thread;
+
pthread_mutex_t mutex;
} x11_private_t;
@@ -145,21 +120,132 @@
};
/*
+ * A thread-safe usecond sleep
+ */
+static void usec_sleep(unsigned long usec) {
+#if HAVE_NANOSLEEP
+ /* nanosleep is prefered on solaris, because it's mt-safe */
+ struct timespec ts;
+
+ ts.tv_sec = usec / 1000000;
+ ts.tv_nsec = (usec % 1000000) * 1000;
+ nanosleep(&ts, NULL);
+#else
+ usleep(usec);
+#endif
+}
+
+static Bool have_xtestextention(Display *display) {
+#ifdef HAVE_XTESTEXTENSION
+ int dummy1, dummy2, dummy3, dummy4;
+
+ return (XTestQueryExtension(display, &dummy1, &dummy2, &dummy3, &dummy4));
+#endif
+ return False;
+}
+
+/*
+ *
+ */
+void reset_screensaver(toxine_vo_plugin_t *vop) {
+ x11_private_t *private = (x11_private_t *) vop->private;
+
+#ifdef HAVE_XTESTEXTENSION
+ if(private->have_xtest == True) {
+ XLockDisplay(private->display);
+ XTestFakeKeyEvent(private->display, private->fake_key, True, CurrentTime);
+ XTestFakeKeyEvent(private->display, private->fake_key, False, CurrentTime);
+ XSync(private->display, False);
+ XUnlockDisplay(private->display);
+ }
+ else
+#endif
+ {
+ XLockDisplay(private->display);
+ XResetScreenSaver(private->display);
+ XUnlockDisplay(private->display);
+ }
+}
+
+/*
+ *
+ */
+static void translate_coords(Display *display, Window win, int *x, int *y) {
+ Window tmp_win;
+
+ if(display && (win != None) && x && y) {
+ XLockDisplay(display);
+ XTranslateCoordinates(display, win, DefaultRootWindow(display), 0, 0, &*x, &*y, &tmp_win);
+ XUnlockDisplay(display);
+ }
+}
+
+/*
+ * Is window is size match with given args
+ */
+static int is_window_visible(Display *display, Window window) {
+ XWindowAttributes wattr;
+ Status status;
+
+ if((display == NULL) || (window == None))
+ return -1;
+
+ XLockDisplay(display);
+ status = XGetWindowAttributes(display, window, &wattr);
+ XUnlockDisplay(display);
+
+ if((status != BadDrawable) && (status != BadWindow) && (wattr.map_state == IsViewable))
+ return 1;
+
+ return 0;
+}
+
+/*
*
*/
static void toggle_fullscreen(toxine_t *tox) {
x11_private_t *private = (x11_private_t *) tox->video.cur_plugin->private;
+ pthread_mutex_lock(&private->mutex);
+
XLockDisplay(private->display);
+
XUnmapWindow(private->display, private->x11_drawable[private->fullscreen].video_window);
+
private->fullscreen = !private->fullscreen;
+
XMapRaised(private->display, private->x11_drawable[private->fullscreen].video_window);
+ XMoveResizeWindow (private->display, private->x11_drawable[private->fullscreen].video_window,
+ private->x11_drawable[private->fullscreen].x,
+ private->x11_drawable[private->fullscreen].y,
+ private->x11_drawable[private->fullscreen].video_width,
+ private->x11_drawable[private->fullscreen].video_height);
+
+ XSync(private->display, False);
XUnlockDisplay(private->display);
+ while(!is_window_visible(private->display,
+ private->x11_drawable[private->fullscreen].video_window))
+ usec_sleep(5000);
+
+ translate_coords(private->display,
+ private->x11_drawable[private->fullscreen].video_window,
+ &private->x11_drawable[private->fullscreen].x,
+ &private->x11_drawable[private->fullscreen].y);
+
+#if 0
+ printf("FULLSCREEN X %d, Y %d **\n",
+ private->x11_drawable[private->fullscreen].x,
+ private->x11_drawable[private->fullscreen].y);
+#endif
+
if(tox->video.driver)
- tox->video.driver->gui_data_exchange (tox->video.driver,
+ tox->video.driver->gui_data_exchange (tox->video.driver,
GUI_DATA_EX_DRAWABLE_CHANGED,
- (void*)private->x11_drawable[private->fullscreen].video_window);
+ (void*) private->x11_drawable[private->fullscreen].video_window);
+
+ pthread_mutex_unlock(&private->mutex);
+
}
/*
@@ -188,10 +274,24 @@
toxine_t *tox = (toxine_t *) data;
toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
x11_private_t *private = (x11_private_t *) vop->private;
+ int screensaver_timer = 0;
// pthread_detach(pthread_self());
+ while(tox->xine == NULL)
+ usec_sleep(100000);
+
while(tox->running) {
+ int status = xine_get_status(tox->xine);
+
+ if(status == XINE_PLAY) {
+ screensaver_timer++;
+#warning FIXME
+ if(screensaver_timer >= 10) {
+ screensaver_timer = 0;
+ reset_screensaver(vop);
+ }
+ }
if(private->cursor.visible) {
private->cursor.visible = !private->cursor.visible;
@@ -205,121 +305,6 @@
}
/*
- * Disable all screensaver.
- */
-static void disable_screensavers(toxine_vo_plugin_t *vop) {
- x11_private_t *private = (x11_private_t *) vop->private;
-
- XLockDisplay(private->display);
-
-#ifdef HAVE_DPMS
- { /* XFree DPMS */
-
- int dummy;
-
- private->screen_savers.xdpms.was_running = 0;
-
- if(DPMSQueryExtension(private->display, &dummy, &dummy)) {
- BOOL enabled;
-
- DPMSInfo(private->display, &private->screen_savers.xdpms.level, &enabled);
-
- if(enabled) {
-
- if(DPMSGetTimeouts(private->display,
- &private->screen_savers.xdpms.standby,
- &private->screen_savers.xdpms.suspend, &private->screen_savers.xdpms.off) != True) {
- fprintf(stderr, "DPMSGetTimeouts() failed\n");
- }
-
- /* monitor powersave off */
- (void) DPMSDisable(private->display);
- private->screen_savers.xdpms.was_running = 1;
- }
- }
- }
-#endif
-
- /* XFree screensaver */
- XGetScreenSaver(private->display ,&private->screen_savers.screensaver.timeout,
- &private->screen_savers.screensaver.interval,
- &private->screen_savers.screensaver.prefer_blanking,
- &private->screen_savers.screensaver.allow_exposures);
-
- if((XSetScreenSaver(private->display, 0, 0,
- DontPreferBlanking, DontAllowExposures)) == BadValue) {
- fprintf(stderr, "XSetScreenSaver() failed: %s\n", strerror(errno));
- }
-
- /* XScreenSaver specific. */
- xscreensaver_remote_init(private->display);
- private->screen_savers.xscreensaver.was_running = is_xscreensaver_running(private->display);
-
- if(private->screen_savers.xscreensaver.was_running == 1) {
- if(xscreensaver_kill_server(private->display) < 0)
- private->screen_savers.xscreensaver.was_running = 0;
- }
-
- XUnlockDisplay(private->display);
-}
-
-/*
- * Reenable previously disabled screensaver.
- */
-static void reenable_screensavers(toxine_vo_plugin_t *vop) {
- x11_private_t *private = (x11_private_t *) vop->private;
-
- XLockDisplay(private->display);
-
-#ifdef HAVE_DPMS
- { /* XFree DPMS */
-
- int dummy;
-
- if(private->screen_savers.xdpms.was_running) {
-
- if(DPMSQueryExtension(private->display, &dummy, &dummy)) {
-
- /* restoring power saving settings */
- if((DPMSEnable(private->display)) == True) {
- CARD16 state;
- BOOL enabled;
-
- (void) DPMSSetTimeouts(private->display,
- private->screen_savers.xdpms.standby,
- private->screen_savers.xdpms.suspend,
- private->screen_savers.xdpms.off);
-
- (void) DPMSForceLevel(private->display, private->screen_savers.xdpms.level);
-
- /* DPMS does not seem to be enabled unless we call DPMSInfo */
- DPMSInfo(private->display, &state, &enabled);
-
- if(enabled)
- private->screen_savers.xdpms.was_running = 0;
-
- }
- }
- }
- }
-#endif
-
- /* XFree screensaver */
- if((XSetScreenSaver(private->display, private->screen_savers.screensaver.timeout,
- private->screen_savers.screensaver.interval,
- private->screen_savers.screensaver.prefer_blanking,
- private->screen_savers.screensaver.allow_exposures)) == BadValue) {
- fprintf(stderr, "XSetScreenSaver() failed: %s\n", strerror(errno));
- }
-
- /* Restart XScreenSaver. */
- if(private->screen_savers.xscreensaver.was_running == 1)
- xscreensaver_start_server();
-
- XUnlockDisplay(private->display);
-}
-
-/*
*
*/
static int video_window_translate_point(toxine_t *tox, toxine_vo_plugin_t *vop,
@@ -423,10 +408,10 @@
*dest_width = private->x11_drawable[private->fullscreen].video_width;
*dest_height = private->x11_drawable[private->fullscreen].video_height;
-
+
*win_x = private->x11_drawable[private->fullscreen].x;
*win_y = private->x11_drawable[private->fullscreen].y;
-
+
}
/*
@@ -489,7 +474,8 @@
if(getenv("DISPLAY"))
display_name = getenv("DISPLAY");
- private->display = XOpenDisplay(display_name);
+ private->display = XOpenDisplay(display_name);
+ private->have_xtest = have_xtestextention(private->display);
pthread_mutex_init(&private->mutex, NULL);
@@ -502,6 +488,10 @@
private->colormap = DefaultColormap(private->display, private->screen);
private->depth = DefaultDepth(private->display, private->screen);
+
+#ifdef HAVE_XTESTEXTENSION
+ private->fake_key = XKeysymToKeycode(private->display, XK_Shift_L);
+#endif
video_out_select_visual(tox, vop);
@@ -731,10 +721,16 @@
exit(1);
}
else
- fprintf(stderr, "video driver '%s' successfuly loaded.\n", tox->video.name);
+ fprintf(stderr, "video driver '%s' successfuly loaded.\n", tox->video.name);
}
+ translate_coords(private->display,
+ private->x11_drawable[private->fullscreen].video_window,
+ &private->x11_drawable[private->fullscreen].x,
+ &private->x11_drawable[private->fullscreen].y);
+
+
{
pthread_attr_t pth_attrs;
struct sched_param pth_params;
@@ -747,7 +743,6 @@
pthread_create(&private->timed_thread, &pth_attrs, timed_loop, (void *)tox);
}
- disable_screensavers(vop);
}
/*
@@ -763,7 +758,7 @@
static void video_window_handle_event(XEvent *xev, toxine_t *tox) {
toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
x11_private_t *private = (x11_private_t *) vop->private;
-
+
switch(xev->type) {
case KeyPress:
@@ -773,7 +768,11 @@
char kbuf[256];
int len;
- if(!private->cursor.visible) {
+ if((!private->cursor.visible)
+#ifdef HAVE_XTESTEXTENSION
+ && (xev->xkey.keycode != private->fake_key)
+#endif
+ ) {
private->cursor.visible = !private->cursor.visible;
update_cursor_visibility(tox);
}
@@ -854,13 +853,25 @@
break;
case ConfigureNotify:
+ pthread_mutex_lock(&private->mutex);
+
if(xev->xany.window == private->x11_drawable[private->fullscreen].video_window) {
- XConfigureEvent *cev = (XConfigureEvent *) xev;
- private->x11_drawable[private->fullscreen].x = cev->x;
- private->x11_drawable[private->fullscreen].y = cev->y;
-
+ translate_coords(private->display,
+ private->x11_drawable[private->fullscreen].video_window,
+ &private->x11_drawable[private->fullscreen].x,
+ &private->x11_drawable[private->fullscreen].y);
+#if 0
+ printf("CONFIGURE X %d, Y %d ** w %d, h %d ** 0x%lx\n",
+ private->x11_drawable[private->fullscreen].x,
+ private->x11_drawable[private->fullscreen].y,
+ private->x11_drawable[private->fullscreen].video_width,
+ private->x11_drawable[private->fullscreen].video_height,
+ private->x11_drawable[private->fullscreen].video_window);
+#endif
+
}
+ pthread_mutex_unlock(&private->mutex);
break;
}
@@ -932,8 +943,6 @@
XCloseDisplay(private->display);
pthread_mutex_unlock(&private->mutex);
-
- reenable_screensavers(vop);
pthread_mutex_destroy(&private->mutex);
free(private);
--- xscreensaver-remote.c DELETED ---
--- xscreensaver-remote.h DELETED ---
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-21 08:57:29
|
Update of /cvsroot/toxine/toxine/src/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv20351/src/plugins
Modified Files:
vo_aa.c vo_dxr3.c vo_plugin.h vo_x11.c
Log Message:
Add get/set video fullscreen.
Index: vo_aa.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_aa.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- vo_aa.c 13 May 2002 20:46:45 -0000 1.1.1.1
+++ vo_aa.c 21 Jun 2002 08:57:25 -0000 1.2
@@ -139,6 +139,19 @@
return "Video out plugin supporting AsciiArt driver.\n";
}
+/*
+ *
+ */
+static int is_fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
+ return 0;
+}
+
+/*
+ *
+ */
+static void fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
+}
+
toxine_vo_plugin_t *toxine_load_vo_plugin(toxine_t *tox) {
toxine_vo_plugin_t *aa;
aa_private_t *private;
@@ -156,7 +169,10 @@
aa->get_property_min_max = get_property_min_max;
aa->set_property = set_property;
aa->get_help = get_help;
+ aa->is_fullscreen = is_fullscreen;
+ aa->fullscreen = fullscreen;
aa->private = (void *) private;
return aa;
}
+
Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_dxr3.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- vo_dxr3.c 13 May 2002 20:46:45 -0000 1.1.1.1
+++ vo_dxr3.c 21 Jun 2002 08:57:25 -0000 1.2
@@ -125,6 +125,13 @@
return "Video out plugin supporting dxr3/hw+ cards.\n";
}
+static int is_fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
+ return 0;
+}
+
+static void fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
+}
+
toxine_vo_plugin_t *toxine_load_vo_plugin(toxine_t *tox) {
toxine_vo_plugin_t *dxr3;
dxr3_private_t *private;
@@ -142,6 +149,8 @@
dxr3->get_property_min_max = get_property_min_max;
dxr3->set_property = set_property;
dxr3->get_help = get_help;
+ dxr3->is_fullscreen = is_fullscreen;
+ dxr3->fullscreen = fullscreen;
dxr3->private = (void *) private;
return dxr3;
Index: vo_plugin.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_plugin.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- vo_plugin.h 13 May 2002 20:46:45 -0000 1.1.1.1
+++ vo_plugin.h 21 Jun 2002 08:57:25 -0000 1.2
@@ -37,6 +37,8 @@
void (*get_property_min_max)(toxine_t *, int property, int *min, int *max);
int (*set_property)(toxine_t *, int property, int value);
char *(*get_help)(void);
+ int (*is_fullscreen)(toxine_t *, toxine_vo_plugin_t *);
+ void (*fullscreen)(toxine_t *, toxine_vo_plugin_t *);
void *private;
};
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_x11.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vo_x11.c 3 Jun 2002 14:53:18 -0000 1.2
+++ vo_x11.c 21 Jun 2002 08:57:25 -0000 1.3
@@ -145,6 +145,24 @@
};
/*
+ *
+ */
+static void toggle_fullscreen(toxine_t *tox) {
+ x11_private_t *private = (x11_private_t *) tox->video.cur_plugin->private;
+
+ XLockDisplay(private->display);
+ XUnmapWindow(private->display, private->x11_drawable[private->fullscreen].video_window);
+ private->fullscreen = !private->fullscreen;
+ XMapRaised(private->display, private->x11_drawable[private->fullscreen].video_window);
+ XUnlockDisplay(private->display);
+
+ if(tox->video.driver)
+ tox->video.driver->gui_data_exchange (tox->video.driver,
+ GUI_DATA_EX_DRAWABLE_CHANGED,
+ (void*)private->x11_drawable[private->fullscreen].video_window);
+}
+
+/*
* Update cursor apparence, reflected by cursor.visible value.
*/
static void update_cursor_visibility(toxine_t *tox) {
@@ -770,16 +788,7 @@
/* Fullscreen toggle */
case XK_f:
case XK_F:
- XLockDisplay(private->display);
- XUnmapWindow(private->display, private->x11_drawable[private->fullscreen].video_window);
- private->fullscreen = !private->fullscreen;
- XMapRaised(private->display, private->x11_drawable[private->fullscreen].video_window);
- XUnlockDisplay(private->display);
-
- if(tox->video.driver)
- tox->video.driver->gui_data_exchange (tox->video.driver,
- GUI_DATA_EX_DRAWABLE_CHANGED,
- (void*)private->x11_drawable[private->fullscreen].video_window);
+ toggle_fullscreen(tox);
break;
}
@@ -1002,6 +1011,21 @@
/*
*
*/
+static int is_fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
+ x11_private_t *private = (x11_private_t *) vop->private;
+ return (private->fullscreen ? 1 : 0);
+}
+
+/*
+ *
+ */
+static void fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
+ toggle_fullscreen(tox);
+}
+
+/*
+ *
+ */
toxine_vo_plugin_t *toxine_load_vo_plugin(toxine_t *tox) {
toxine_vo_plugin_t *x11;
x11_private_t *private;
@@ -1019,6 +1043,8 @@
x11->get_property_min_max = get_property_min_max;
x11->set_property = set_property;
x11->get_help = get_help;
+ x11->is_fullscreen = is_fullscreen;
+ x11->fullscreen = fullscreen;
x11->private = (void *) private;
return x11;
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-21 08:57:28
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv20351/src
Modified Files:
commands.c
Log Message:
Add get/set video fullscreen.
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- commands.c 13 Jun 2002 12:06:45 -0000 1.4
+++ commands.c 21 Jun 2002 08:57:25 -0000 1.5
@@ -141,6 +141,7 @@
{ "set", OPTIONAL_ARGS, do_set,
"Set some internal values.",
"set video driver <name>\n"
+ "set video fullscreen\n"
"set video property <property> <value> (see xine_set_video_property)\n"
"set audio driver <name>\n"
"set audio volume <level>\n"
@@ -156,6 +157,7 @@
"get audio driver\n"
"get audio capabilities\n"
"get video capabilities\n"
+ "get video fullscreen\n"
"get video property <property> (see xine_get_video_property)\n"
"get video property_min_max <property> (see xine_get_video_property_min_max)\n",
},
@@ -773,6 +775,17 @@
if(toxine_is_arg_contain(tox, 2, "capabilities")) {
_NAPI_xine_get_video_capabilities(NULL, tox, NULL);
}
+ else if(toxine_is_arg_contain(tox, 2, "fullscreen")) {
+ int fullscreen;
+ CHECK_XINE(tox);
+ if(tox->video.cur_plugin->is_fullscreen) {
+ fullscreen = tox->video.cur_plugin->is_fullscreen(tox, tox->video.cur_plugin);
+ pinfo("fullscreen is %d\n", fullscreen);
+ pinfo(".\n");
+ }
+ else
+ pout("fullscreen isn't supported by video plugin\n");
+ }
}
else if(nargs >= 3) {
@@ -855,6 +868,11 @@
pinfo("current video driver name: %s\n",
(tox->video.name)?tox->video.name:"unset");
}
+ }
+ else if(toxine_is_arg_contain(tox, 2, "fullscreen")) {
+ CHECK_XINE(tox);
+ if(tox->video.cur_plugin->fullscreen)
+ tox->video.cur_plugin->fullscreen(tox, tox->video.cur_plugin);
}
}
}
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-13 12:06:48
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv23214
Modified Files:
commands.c
Log Message:
Remove no more available XINE_LOGO engine status.
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- commands.c 3 Jun 2002 14:53:18 -0000 1.3
+++ commands.c 13 Jun 2002 12:06:45 -0000 1.4
@@ -97,7 +97,6 @@
prompt_state_t prompt_state[] = {
{ XINE_STOP , "STOP" },
- { XINE_LOGO , "STOP" },
{ XINE_PLAY , "PLAY" },
{ XINE_QUIT , "QUIT" },
{ -1 , "NOT INIT" },
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-03 21:26:13
|
Update of /cvsroot/toxine/toxine In directory usw-pr-cvs1:/tmp/cvs-serv20725 Modified Files: configure.in Log Message: Require 0.9.10. Index: configure.in =================================================================== RCS file: /cvsroot/toxine/toxine/configure.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- configure.in 3 Jun 2002 19:48:30 -0000 1.6 +++ configure.in 3 Jun 2002 21:26:10 -0000 1.7 @@ -87,7 +87,7 @@ dnl dnl Check for xine-lib dnl -AM_PATH_XINE(0.9.9,, AC_MSG_ERROR(*** You should install xine-lib first ***)) +AM_PATH_XINE(0.9.10,, AC_MSG_ERROR(*** You should install xine-lib first ***)) dnl |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-03 21:26:13
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv20725/src
Modified Files:
main.c
Log Message:
Require 0.9.10.
Index: main.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/main.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- main.c 13 May 2002 20:46:36 -0000 1.1.1.1
+++ main.c 3 Jun 2002 21:26:10 -0000 1.2
@@ -131,8 +131,8 @@
int i;
/* Check xine library version */
- if(!xine_check_version(0, 9, 9)) {
- fprintf(stderr, "Require xine library version 0.9.9, found %d.%d.%d.\n",
+ if(!xine_check_version(0, 9, 10)) {
+ fprintf(stderr, "Require xine library version 0.9.10, found %d.%d.%d.\n",
xine_get_major_version(), xine_get_minor_version(),
xine_get_sub_version());
exit(1);
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-03 19:48:33
|
Update of /cvsroot/toxine/toxine In directory usw-pr-cvs1:/tmp/cvs-serv20295 Modified Files: configure.in Log Message: ML test. Index: configure.in =================================================================== RCS file: /cvsroot/toxine/toxine/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- configure.in 20 May 2002 22:11:31 -0000 1.5 +++ configure.in 3 Jun 2002 19:48:30 -0000 1.6 @@ -46,6 +46,7 @@ dnl obsolete AC_PROG_RANLIB AC_PROG_LN_S + dnl dnl Libtool dnl |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-03 14:53:22
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv13776/src
Modified Files:
commands.c xine_commands.c
Log Message:
Add vidix support (via X11). call xine_exit() on quit (avoid vidix DGA stays).
Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- commands.c 20 May 2002 16:14:26 -0000 1.2
+++ commands.c 3 Jun 2002 14:53:18 -0000 1.3
@@ -97,6 +97,7 @@
prompt_state_t prompt_state[] = {
{ XINE_STOP , "STOP" },
+ { XINE_LOGO , "STOP" },
{ XINE_PLAY , "PLAY" },
{ XINE_QUIT , "QUIT" },
{ -1 , "NOT INIT" },
@@ -716,6 +717,9 @@
}
/* deinit video_out plugin */
+ if(tox->xine)
+ _xine_exit(NULL, tox, NULL);
+
if(tox->video.cur_plugin && tox->video.cur_plugin->video_out_deinit)
tox->video.cur_plugin->video_out_deinit(tox, tox->video.cur_plugin);
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xine_commands.c 23 May 2002 19:46:04 -0000 1.3
+++ xine_commands.c 3 Jun 2002 14:53:18 -0000 1.4
@@ -424,6 +424,7 @@
xine_remove_event_listener(tox->xine, toxine_event_listener);
pinfo("xine_exit()\n");
xine_exit(tox->xine);
+ tox->xine = NULL;
pinfo(".\n");
}
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-06-03 14:53:22
|
Update of /cvsroot/toxine/toxine/src/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv13776/src/plugins
Modified Files:
vo_x11.c
Log Message:
Add vidix support (via X11). call xine_exit() on quit (avoid vidix DGA stays).
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_x11.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- vo_x11.c 13 May 2002 20:46:48 -0000 1.1.1.1
+++ vo_x11.c 3 Jun 2002 14:53:18 -0000 1.2
@@ -892,7 +892,7 @@
void *pdummy;
pthread_join(private->timed_thread, &pdummy);
-
+
pthread_mutex_lock(&private->mutex);
XLockDisplay(private->display);
@@ -909,7 +909,7 @@
XFreeCursor(private->display, private->cursor.cursors[0]);
XFreeCursor(private->display, private->cursor.cursors[1]);
-
+
XFreeGC(private->display, private->x11_drawable[private->fullscreen].gc);
XDestroyWindow(private->display, private->x11_drawable[private->fullscreen].video_window);
@@ -919,6 +919,9 @@
XDestroyWindow(private->display, private->x11_drawable[private->fullscreen].video_window);
XUnlockDisplay(private->display);
+
+ XCloseDisplay(private->display);
+
pthread_mutex_unlock(&private->mutex);
reenable_screensavers(vop);
@@ -938,7 +941,7 @@
/*
*
*/
-static char *_vo_x11_names[] = { "Xv", "XShm", "dxr3_ov", NULL };
+static char *_vo_x11_names[] = { "Xv", "XShm", "dxr3_ov", "vidix", NULL };
static char **get_names(void) {
return _vo_x11_names;
}
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-05-23 19:46:07
|
Update of /cvsroot/toxine/toxine/src
In directory usw-pr-cvs1:/tmp/cvs-serv11447
Modified Files:
xine_commands.c
Log Message:
change printf() to perr().
Index: xine_commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/xine_commands.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xine_commands.c 14 May 2002 07:03:09 -0000 1.2
+++ xine_commands.c 23 May 2002 19:46:04 -0000 1.3
@@ -372,7 +372,7 @@
void _xine_init(commands_t *command, toxine_t *tox, void *data) {
if(!toxine_video_out_init(tox)) {
- printf("unable to initialize video out plugin.\n");
+ perr("unable to initialize video out plugin.\n");
return;
}
|
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-05-20 22:11:33
|
Update of /cvsroot/toxine/toxine In directory usw-pr-cvs1:/tmp/cvs-serv19277 Modified Files: configure.in Log Message: test Index: configure.in =================================================================== RCS file: /cvsroot/toxine/toxine/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- configure.in 20 May 2002 22:04:58 -0000 1.4 +++ configure.in 20 May 2002 22:11:31 -0000 1.5 @@ -19,7 +19,7 @@ TOXINE_MAJOR=0 TOXINE_MINOR=3 TOXINE_SUB=0 -TOXINE_PRE="`if test -f ./.cvsversion; then echo cvs; fi`" +TOXINE_PRE="`if test -f ./.cvsversion; then echo cvs;fi`" TAR_NAME="toxine-"$TOXINE_MAJOR.$TOXINE_MINOR.$TOXINE_SUB$TOXINE_PRE SPEC_VERSION=$TOXINE_MAJOR.$TOXINE_MINOR.$TOXINE_SUB$TOXINE_PRE |
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-05-20 21:56:16
|
Update of /cvsroot/toxine/toxine In directory usw-pr-cvs1:/tmp/cvs-serv15474 Modified Files: configure.in Log Message: CVS log test. Index: configure.in =================================================================== RCS file: /cvsroot/toxine/toxine/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.in 20 May 2002 16:14:26 -0000 1.2 +++ configure.in 20 May 2002 21:56:12 -0000 1.3 @@ -19,7 +19,7 @@ TOXINE_MAJOR=0 TOXINE_MINOR=3 TOXINE_SUB=0 -TOXINE_PRE="`if test -f ./.cvsversion; then echo cvs; fi`" +TOXINE_PRE="`if test -f ./.cvsversion; then echo cvs;fi`" TAR_NAME="toxine-"$TOXINE_MAJOR.$TOXINE_MINOR.$TOXINE_SUB$TOXINE_PRE SPEC_VERSION=$TOXINE_MAJOR.$TOXINE_MINOR.$TOXINE_SUB$TOXINE_PRE |
