From bb57136ac84f8f31f472eea137f70846cee9e9e5 Mon Sep 17 00:00:00 2001 From: Jean-Paul Saman Date: Sun, 8 Dec 2002 21:05:42 +0000 Subject: [PATCH] Fixed build and linking for qte video output and made modifications to iPaq packaging files. --- configure.ac.in | 40 ++++++++--------------------- ipkg/control.gpe | 4 +-- ipkg/control.opie | 4 +-- ipkg/postinst.opie | 4 --- modules/video_output/qte/qte.cpp | 43 +++++++++++++++++++------------- 5 files changed, 40 insertions(+), 55 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 8d5a6e6bb5..78c8cd8661 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1815,24 +1815,16 @@ then if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x" then LDFLAGS_qte="${LDFLAGS_qte} -L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte" - CFLAGS_qte="${CFLAGS_qte} -I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" + CPPFLAGS_qte="${CPPFLAGS_qte} -I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" else LDFLAGS_qte="${LDFLAGS_qte} -L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte" - CFLAGS_qte="${CFLAGS_qte} -I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" + CPPFLAGS_qte="${CPPFLAGS_qte} -I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" fi PLUGINS="${PLUGINS} qte" - CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_qte}" -# ac_cv_qte_headers=yes + CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}" AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ -# ac_cv_qte_headers=no AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."]) ] ) - if test "x${ac_cv_qte_headers}" = "xyes" - then -# CFLAGS_qte="${CFLAGS_qte} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" -# LDFLAGS_qte="${LDFLAGS_qte} -ljpeg -lqte" -# PLUGINS="${PLUGINS} qte" - fi CPPFLAGS="${CPPFLAGS_save}" fi @@ -2175,9 +2167,6 @@ then AC_CHECK_HEADERS(gpe/init.h, , [ ac_cv_gpe_headers=no AC_MSG_ERROR([Cannot find development headers for libgpewidget...]) ]) -# AC_CHECK_LIB(gpewidget, gpe_application_init, -# [ LDFLAGS_gpe="${LDFLAGS_gpe} -lgpewidget" ], -# [ AC_MSG_ERROR([Cannot find libgpewidget library...]) ]) CFLAGS=$CFLAGS_save LDFLAGS=$LDFLAG_save if test "x${ac_cv_gpe_headers}" = "xyes" @@ -2309,33 +2298,26 @@ AC_ARG_ENABLE(opie, [ --with-qte=PATH Qt Embedded headers and libraries]) if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x" then - LDFLAGS_test="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'`" - CFLAGS_test="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'`" + LDFLAGS_qte="-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte" + CPPFLAGS_qte="-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" else - LDFLAGS_test="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`" - CFLAGS_test="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`" + LDFLAGS_qte="-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`" + CPPFLAGS_qte="-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`" fi - CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_test}" - ac_cv_qte_headers=yes + CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}" AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ - ac_cv_qte_headers=no AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."]) ] ) - if test "x${ac_cv_qte_headers}" = "xyes" - then - CFLAGS_qte="${CFLAGS_qte} ${CFLAGS_test} -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti" - LDFLAGS_qte="${LDFLAGS_qte} ${LDFLAGS_test} -ljpeg -lqte" - fi CPPFLAGS="${CPPFLAGS_save}" PLUGINS="${PLUGINS} opie" LDFLAGS_opie="${LDFLAGS_opie} -lqpe ${LDFLAGS_qte}" CPPFLAGS_opie="${CPPFLAGS_opie} ${CPPFLAGS_qte}" - if test -x ${QTEDIR}/bin/moc + if test "x${with_qte}" != "xno" -a "x${with_qte}" != "x" then - MOC=${QTEDIR}/bin/moc + MOC=${with_qte}/bin/moc else - MOC=moc + MOC=${QTDIR}/bin/moc fi fi]) diff --git a/ipkg/control.gpe b/ipkg/control.gpe index 7543766f74..1268c43b55 100644 --- a/ipkg/control.gpe +++ b/ipkg/control.gpe @@ -13,5 +13,5 @@ Description: VideoLAN Client is a free network-aware MPEG and DVD player. source can be found on: http://www.videolan.org/pub/videolan/vlc/ The VideoLAN Client allows to play MPEG1, MPEG2 Transport Streams and - Program Streams from the network or from a file, as well as direct DVD - playback. + Program Streams, MP3, Divx and other codecs from the network or from a file, + as well as direct DVD playback. diff --git a/ipkg/control.opie b/ipkg/control.opie index cf402cfc6e..670b0e6918 100644 --- a/ipkg/control.opie +++ b/ipkg/control.opie @@ -13,5 +13,5 @@ Description: VideoLAN Client is a free network-aware MPEG and DVD player. source can be found on: http://www.videolan.org/pub/videolan/vlc/ The VideoLAN Client allows to play MPEG1, MPEG2 Transport Streams and - Program Streams from the network or from a file, as well as direct DVD - playback. + Program Streams, MP3, DivX and lots of other codecs from the network or + from a file, as well as direct DVD playback. diff --git a/ipkg/postinst.opie b/ipkg/postinst.opie index 90b9b24364..f2bb784c07 100755 --- a/ipkg/postinst.opie +++ b/ipkg/postinst.opie @@ -3,8 +3,4 @@ ldconfig if [ -x /usr/share/videolan ] ; then ln -s /usr/share/videolan /opt/QtPalmtop/pics/videolan fi -# Added support for iPaq 3870 -if [ -x /usr/local/qt-embedded/lib/fonts/fontdir ] ; then - ln -s /usr/local/qt-embedded/lib/fonts/fontdir /opt/QtPalmtop/lib/fonts/fontdir -fi exit 0 diff --git a/modules/video_output/qte/qte.cpp b/modules/video_output/qte/qte.cpp index 294d456f6e..07e346337b 100644 --- a/modules/video_output/qte/qte.cpp +++ b/modules/video_output/qte/qte.cpp @@ -2,7 +2,7 @@ * qte.cpp : QT Embedded plugin for vlc ***************************************************************************** * Copyright (C) 1998-2002 VideoLAN - * $Id: qte.cpp,v 1.4 2002/10/04 18:07:21 sam Exp $ + * $Id: qte.cpp,v 1.5 2002/12/08 21:05:42 jpsaman Exp $ * * Authors: Gerald Hansink * Jean-Paul Saman @@ -34,6 +34,8 @@ * - etc. *****************************************************************************/ +extern "C" +{ #include /* ENOMEM */ #include /* free() */ #include /* strerror() */ @@ -56,6 +58,7 @@ #ifdef HAVE_SYS_SHM_H # include /* shmget(), shmctl() */ #endif +} /* extern "C" */ #include #include @@ -66,6 +69,8 @@ # include #endif +extern "C" +{ #include "netutils.h" /* network_ChannelJoin */ #include "qte.h" @@ -100,6 +105,7 @@ static void Display ( vout_thread_t *, picture_t * ); static int Manage ( vout_thread_t * ); static int Init ( vout_thread_t * ); static void End ( vout_thread_t * ); +} /* extern "C" */ static int CreateQtWindow ( vout_thread_t * ); static void DestroyQtWindow( vout_thread_t * ); @@ -114,6 +120,8 @@ static void RunQtThread( event_thread_t *p_event ); /***************************************************************************** * Exported prototypes *****************************************************************************/ +extern "C" +{ vlc_module_begin(); add_category_hint( N_("QT Embedded"), NULL ); @@ -121,10 +129,11 @@ vlc_module_begin(); add_bool( "qte-altfullscreen", 0, NULL, NULL, NULL); //ALT_FS_TEXT, ALT_FS_LONGTEXT ); add_integer( "qte-drawable", -1, NULL, NULL, NULL); //DRAWABLE_TEXT, DRAWABLE_LONGTEXT ); set_description( _("QT Embedded module") ); - set_capability( "video output", 20 ); + set_capability( "video output", 30 ); set_callbacks( Open, Close); vlc_module_end(); +} /* extern "C" */ /***************************************************************************** * Seeking function TODO: put this in a generic location ! @@ -138,9 +147,10 @@ static inline void vout_Seek( off_t i_seek ) *****************************************************************************/ static int Open( vlc_object_t *p_this ) { - //msg_Err(p_vout, "+vout_Create::qte" ); vout_thread_t * p_vout = (vout_thread_t *)p_this; + msg_Err(p_vout, "+vout_Create::qte" ); + /* Allocate structure */ p_vout->p_sys = (struct vout_sys_t*) malloc( sizeof( struct vout_sys_t ) ); @@ -151,7 +161,6 @@ static int Open( vlc_object_t *p_this ) } // memset(p_vout->p_sys, 0, sizeof( struct vout_sys_t )); - p_vout->pf_init = Init; p_vout->pf_end = End; p_vout->pf_manage = NULL; //Manage; @@ -160,7 +169,7 @@ static int Open( vlc_object_t *p_this ) CreateQtWindow(p_vout); - //msg_Err(p_vout, "-vout_Create::qte" ); + msg_Err(p_vout, "-vout_Create::qte" ); return( 0 ); } @@ -173,7 +182,7 @@ static void Close ( vlc_object_t *p_this ) { vout_thread_t * p_vout = (vout_thread_t *)p_this; - //msg_Err( p_vout, "+vout_Destroy::qte" ); + msg_Err( p_vout, "+vout_Destroy::qte" ); DestroyQtWindow(p_vout); free(p_vout->p_sys); } @@ -191,7 +200,7 @@ static int Init( vout_thread_t *p_vout ) int dd = QPixmap::defaultDepth(); - //msg_Err( p_vout,"+vout_Init::qte" ); + msg_Err( p_vout,"+vout_Init::qte" ); I_OUTPUTPICTURES = 0; @@ -234,7 +243,7 @@ static int Init( vout_thread_t *p_vout ) I_OUTPUTPICTURES++; } - //msg_Err(p_vout, "-vout_Init::qte %d output pictures", I_OUTPUTPICTURES); + msg_Err(p_vout, "-vout_Init::qte %d output pictures", I_OUTPUTPICTURES); return( 0 ); } @@ -256,7 +265,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) *****************************************************************************/ static void Display( vout_thread_t *p_vout, picture_t *p_pic ) { - int x, y, w, h; + unsigned int x, y, w, h; vout_PlacePicture( p_vout, p_vout->p_sys->i_width, p_vout->p_sys->i_height, &x, &y, &w, &h ); @@ -333,7 +342,7 @@ static void End( vout_thread_t *p_vout ) { int i_index; - //msg_Err(p_vout, "+vout_End::qte" ); + msg_Err(p_vout, "+vout_End::qte" ); /* Free the direct buffers we allocated */ for( i_index = I_OUTPUTPICTURES ; i_index ; ) @@ -353,7 +362,7 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) { int dd = QPixmap::defaultDepth(); - //msg_Err(p_vout, "+NewPicture::dd = %d",dd ); + msg_Err(p_vout, "+NewPicture::dd = %d",dd ); p_pic->p_sys = (picture_sys_t*) malloc( sizeof( picture_sys_t ) ); @@ -427,11 +436,11 @@ static int NewPicture( vout_thread_t *p_vout, picture_t *p_pic ) break; } -/* + msg_Err(p_vout, "NewPicture: %d %d %d",p_vout->output.i_width, p_vout->output.i_height, p_vout->output.i_chroma ); -*/ + return 0; } @@ -462,12 +471,9 @@ static void ToggleFullScreen ( vout_thread_t *p_vout ) *****************************************************************************/ static int CreateQtWindow( vout_thread_t *p_vout ) { - //msg_Err(p_vout, "vout_qt: +init qt window"); + msg_Err(p_vout, "vout_qt: +init qt window"); /* for displaying the vout in a qt window we need the QtApplication */ -// vlc_thread_t thread_id; - //msg_Err( "vout_qt: +init qt window, creating qpe application"); - p_vout->p_sys->pcVoutWidget = NULL; /* create thread to exec the qpe application */ @@ -480,6 +486,7 @@ static int CreateQtWindow( vout_thread_t *p_vout ) msg_Err( p_vout, "input error: can't spawn video output thread"); return( -1 ); } + msg_Err( p_vout, "input error: QT video window spawned in video output thread"); p_vout->p_sys->i_width = 320; p_vout->p_sys->i_height = 240; @@ -490,7 +497,7 @@ static int CreateQtWindow( vout_thread_t *p_vout ) msleep(1); } - //msg_Err( "vout_qt: -init qt window"); + msg_Err( p_vout, "vout_qt: -init qt window"); return( 0 ); } -- 2.39.2