Changeset 5fec93e17a9a45fb7c20dec7be0ca59775abbe39

Show
Ignore:
Timestamp:
19/01/03 23:16:13 (6 years ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1043014573 +0000
git-parent:

[4e1cda09665d0f044943720371c551a5e194b024]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1043014573 +0000
Message:

New "qte_main" module. It should be used by all plugins/modules that need QT embedded. Also ported modules/qte/qte.{cpp,h} to use it.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • configure.ac.in

    rcaefa42 r5fec93e  
    437437NEED_GNOME_MAIN=no 
    438438 
     439dnl build the qte plugin ? 
     440NEED_QTE_MAIN=no 
     441 
    439442dnl Check for DPMS 
    440443if test "x${SYS}" != "xmingw32" 
    …… 
    19231926  fi 
    19241927  PLUGINS="${PLUGINS} qte" 
     1928  NEED_QTE_MAIN=yes 
    19251929  CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_qte}" 
    19261930  AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ 
    …… 
    24142418 
    24152419     PLUGINS="${PLUGINS} opie" 
     2420     NEED_QTE_MAIN=yes 
    24162421     LDFLAGS_opie="${LDFLAGS_opie} -lqpe ${LDFLAGS_qte}" 
    24172422     CPPFLAGS_opie="${CPPFLAGS_opie} ${CPPFLAGS_qte}" 
    …… 
    27112716 
    27122717dnl 
     2718dnl  qte_main plugin 
     2719dnl 
     2720if test "x${NEED_QTE_MAIN}" != "xno" 
     2721then 
     2722    PLUGINS="${PLUGINS} qte_main" 
     2723    CPPFLAGS_qte="${CPPFLAGS_qte} -DNEED_QTE_MAIN" 
     2724    CPPFLAGS_opie="${CPPFLAGS_opie} -DNEED_QTE_MAIN" 
     2725    CPPFLAGS_qte_main="${CFLAGS_qte_main} ${CPPFLAGS_qte}" 
     2726    LDFLAGS_qte_main="${LDFLAGS_qte_main} ${LDFLAGS_qte}" 
     2727fi 
     2728 
     2729 
     2730dnl 
    27132731dnl  Plugin and builtin checks 
    27142732dnl 

  • ipkg/control

    r2d54f8a r5fec93e  
    33Priority: optional 
    44Version: 0.5.0 
    5 Release: 1 
     5Release: test3 
    66Architecture: arm 
    77Conflicts: task-opie, gpe-vlc, gpe 

  • ipkg/control.gpe

    rdafc259 r5fec93e  
    33Priority: optional 
    44Version: 0.5.0 
    5 Release: test2 
     5Release: test3 
    66Conflicts: task-opie, vlc 
    77Architecture: arm 

  • ipkg/control.opie

    rbb57136 r5fec93e  
    33Priority: optional 
    44Version: 0.5.0 
    5 Release: 1 
    6 Conflicts: gpe, vlc 
     5Release: test3 
     6Conflicts: gpe, vlc, libsdl 
    77Architecture: arm 
    88Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr> 
    9 Depends: libc6, task-opie 
     9Depends: libc6, task-opie, opie-libsdl 
    1010Copyright: GPL 
    1111Description: VideoLAN Client is a free network-aware MPEG and DVD player. 

  • ipkg/rules

    r37a6b0e r5fec93e  
    1111export STRIP=arm-linux-strip 
    1212 
    13 #export CONFIG_FLAGS="--enable-release --prefix=/usr --disable-gtk --enable-fb --enable-sdl --disable-xvideo --disable-plugins --with-tuning=strongarm1100 --x-includes=/skiff/local/arm-linux/include --x-libraries=/skiff/local/arm-linux/lib/X11 --with-sdl-config-path=/skiff/local/bin --with-mad=/skiff/local/arm-linux" 
    14  
    1513export CONFIG_FLAGS="--enable-release --prefix=/usr \ 
    1614    --disable-plugins \ 
    …… 
    2422    --enable-oss \ 
    2523    --disable-alsa \ 
     24    --enable-x11 \ 
    2625    --disable-xvideo \ 
    2726    --disable-dvd \ 

  • ipkg/rules.gpe

    ra5d19ec r5fec93e  
    5555        --target=arm-linux \ 
    5656        $(shell echo $(CONFIG_FLAGS)) \ 
    57         LDFLAGS=/usr/local/arm/2.95.3/arm-linux/lib 
     57        LDFLAGS="-L/usr/local/arm/2.95.3/arm-linux/lib" 
    5858 
    5959build: 

  • ipkg/rules.opie

    r3414698 r5fec93e  
    2020    --disable-x11 \ 
    2121    --enable-fb \ 
    22     --disable-sdl \ 
     22    --enable-sdl \ 
    2323    --disable-alsa \ 
    2424    --disable-xvideo \ 

  • modules/misc/Modules.am

    re5daac6 r5fec93e  
    22SOURCES_gnome_main = modules/misc/gtk_main.c 
    33SOURCES_sap = modules/misc/sap.c 
     4SOURCES_qte_main = modules/misc/qte_main.cpp 

  • modules/video_output/qte/qte.cpp

    r88b2fd3 r5fec93e  
    33 ***************************************************************************** 
    44 * Copyright (C) 1998-2002 VideoLAN 
    5  * $Id: qte.cpp,v 1.8 2002/12/24 19:25:54 jpsaman Exp $ 
     5 * $Id: qte.cpp,v 1.9 2003/01/19 22:16:13 jpsaman Exp $ 
    66 * 
    77 * Authors: Gerald Hansink <gerald.hansink@ordain.nl> 
    …… 
    6565 
    6666#ifdef Q_WS_QWS 
    67 # define USE_DIRECT_PAINTER 
    68 # include <qdirectpainter_qws.h> 
    69 # include <qgfxraster_qws.h> 
     67#   define USE_DIRECT_PAINTER 
     68#   include <qdirectpainter_qws.h> 
     69#   include <qgfxraster_qws.h> 
    7070#endif 
    7171 
    …… 
    130130    set_description( _("QT Embedded module") ); 
    131131    set_capability( "video output", 30 ); 
     132//    add_shortcut( "qte" ); 
    132133    set_callbacks( Open, Close); 
    133134vlc_module_end(); 
    …… 
    165166    p_vout->pf_display = Display; 
    166167 
     168#ifdef NEED_QTE_MAIN 
     169    p_vout->p_sys->p_qte_main = module_Need( p_this, "qte_main", "qte" ); 
     170    if( p_vout->p_sys->p_qte_main == NULL ) 
     171    { 
     172        free( p_vout->p_sys ); 
     173        return VLC_ENOMOD; 
     174    } 
     175#endif 
     176 
    167177    CreateQtWindow(p_vout); 
    168178    return( 0 ); 
    …… 
    190200        vlc_object_destroy( p_vout->p_sys->p_event ); 
    191201    } 
     202 
     203#ifdef NEED_QTE_MAIN 
     204    module_Unneed( p_vout, p_vout->p_sys->p_qte_main ); 
     205#endif 
    192206 
    193207    if( p_vout->p_sys ) 
    …… 
    529543    if(p_vout->p_sys->pcQApplication) 
    530544    { 
     545#ifndef NEED_QTE_MAIN 
    531546        if(p_vout->p_sys->bOwnsQApp) 
    532547        { 
    …… 
    534549        } 
    535550        else 
    536         { 
     551#endif 
    537552            p_vout->p_sys->bRunning = FALSE; 
    538         } 
    539553 
    540554        while(p_vout->p_sys->pcVoutWidget) 
    …… 
    567581    { 
    568582        p_event->p_vout->p_sys->pcQApplication = qApp; 
     583        p_event->p_vout->p_sys->bOwnsQApp = FALSE; 
    569584        msg_Dbg( p_event->p_vout, "RunQtThread applicaton attached" ); 
    570585    } 
    …… 
    585600        { 
    586601            // run the main loop of qtapplication until someone says: 'quit' 
     602            msg_Dbg( p_event->p_vout, "+qte::RunQtThread starting application" ); 
    587603            p_event->p_vout->p_sys->pcQApplication->exec(); 
    588604        } 
    …… 
    604620    if(p_event->p_vout->p_sys->bOwnsQApp) 
    605621    { 
     622        msg_Dbg( p_event->p_vout, "+qte::RunQtThread deleting application" ); 
    606623        delete p_event->p_vout->p_sys->pcQApplication; 
    607624        p_event->p_vout->p_sys->pcQApplication = NULL; 

  • modules/video_output/qte/qte.h

    re428120 r5fec93e  
    33 ***************************************************************************** 
    44 * Copyright (C) 1998-2002 VideoLAN 
    5  * $Id: qte.h,v 1.3 2002/09/23 21:44:23 jpsaman Exp $ 
     5 * $Id: qte.h,v 1.4 2003/01/19 22:16:13 jpsaman Exp $ 
    66 * 
    77 * Authors: Gerald Hansink <gerald.hansink@ordain.nl> 
    …… 
    5757    QWidget*            pcVoutWidget; 
    5858 
     59#ifdef NEED_QTE_MAIN 
     60    module_t *          p_qte_main; 
     61#endif 
     62 
    5963    event_thread_t *    p_event; 
    6064};