Changeset e2a614c82b502ea6c3cdee7d0fc39cbb9627041e

Timestamp:

26/06/08 09:38:53 (5 months ago)

Author:

Ilkka Ollakka <ileoo@videolan.org>

git-committer:

Ilkka Ollakka <ileoo@videolan.org> 1214465933 +0300

git-parent:

[51f898a0eb6029c1922b2b4311f074245c99e963], [c617646c2e1a5675791200e7eeb54f111875a559]

git-author:

Ilkka Ollakka <ileoo@videolan.org> 1214465933 +0300

Message:

Merge branch 'master' of git@git.videolan.org:vlc

Files:

• NEWS (modified) (13 diffs)
• THANKS (modified) (1 diff)
• configure.ac (modified) (1 diff)
• extras/contrib/src/Distributions/win32.mak (modified) (1 diff)
• extras/contrib/src/Makefile (modified) (1 diff)
• extras/contrib/src/packages.mak (modified) (1 diff)
• extras/package/win32/vlc.win32.nsi.in (modified) (1 diff)
• include/vlc_interface.h (modified) (1 diff)
• modules/gui/qt4/components/extended_panels.cpp (modified) (1 prop)
• modules/gui/qt4/components/interface_widgets.cpp (modified) (11 diffs)
• modules/gui/qt4/components/interface_widgets.hpp (modified) (3 diffs)
• modules/gui/qt4/components/open_panels.cpp (modified) (9 diffs)
• modules/gui/qt4/components/open_panels.hpp (modified) (1 diff)
• modules/gui/qt4/dialogs/help.cpp (modified) (1 diff)
• modules/gui/qt4/main_interface.cpp (modified) (4 diffs)
• modules/gui/qt4/qt4.cpp (modified) (14 diffs)
• modules/gui/qt4/ui/open_capture.ui (modified) (3 diffs)
• modules/gui/qt4/ui/open_net.ui (modified) (1 diff)
• modules/video_filter/rss.c (modified) (1 diff)
• src/input/stream.c (modified) (1 diff)
• src/libvlc-module.c (modified) (1 diff)
• src/misc/update.c (modified) (13 diffs)
• src/misc/update.h (modified) (2 diffs)

NEWS

@@ -6 +6 @@
-Important notes:
-----------------
+ * This release will not work with Windows 98/ME and Mac OS X 10.3.9 (Panther)
- * The HTTP interface is now only available on the local machine by default.
-   If you want to make it available from other machines, you will have to
@@ -16 +17 @@
-   - On Mac OS X, you can find it in VLC.app/Contents/MacOS/share/http/.hosts
-     and respectively in VLC.app/Contents/MacOS/share/http/old/.hosts
- This
-interface lacks the "Streaming Wizard" that used to be present in VLC 0.8.6.
-It will be replaced by a better alternative in the next version. 
+
+This interface has a fullscreen controller. This interface lacks the
+"Streaming Wizard" that used to be present in VLC 0.8.6.
-   If you absolutely need it, we advise you to keep VLC 0.8.6.
- * The behavior of --sout-keep was changed. It's now activated by default.
@@ -34 +35 @@
-   of options is available to m3u playlists (CVE-2007-6683).
- * The old access:url syntax is no longer supported. Use access://url instead.
-   
-   
+    
+    
- * The ffmpeg module has been removed and replaced by avcodec, avformat, swscale
-   (or imgresample if you use a swscale-less ffmpeg build) and postproc modules.
-
-
-
-
+
+
+
+
+
- * Croping and padding in transcode are now done using the croppadd video
-   filter. For example:
@@ -57 +59 @@
-Playlist:
- * Vastly improved playlist support:
-support
+creation to save all your playlist items
-    * "Live search"
-    * Shoutcast TV listings
@@ -75 +77 @@
- * Input run time option (improved live stream recording)
- * BDA devices access module for DVB-C/S/T capture cards on Microsoft Windows
-
+ 
-   using OpenGL instead of QuickDraw
- * Screen module now supports partial screen capture and mouse following on X11.
- (Mac OS X only)
+
-   This requires the user to install a plugin to EyeTV.app
-   (available as a separate download).
- * RTMP input support
- * QTKit-based Input module for Mac OS X allowing display and streaming of video
-QuickTime-compatible video devices (no audio ye
+iSight-labelled video cameras (no audio suppor
- * HTTP access now supports gzip compressed data and Digest Access
-   Authentication.
@@ -103 +105 @@
- * CD+G karaoke Files support
- * MXF files support
+ * OMA support
-
-Decoders:
@@ -114 +117 @@
- * New codec FOURCCs to support more specific files:
-   Avid, FCP, Sony, Samsung, ...
- * Closed Caption Decoder (DVD, ReplayTV, TiVo, DVB/ATSC)
- * H.264 PAFF support
- * DNxHD / VC-3 support
- * NellyMoser ASAO support
- * APE (Monkey audio) support
- * VBI & EBU (Teletext) support
- * RealVideo support (with the RealVideo run-time)
-
-Subtitles:
+ * Closed Caption Decoder (DVD, ReplayTV, TiVo, DVB/ATSC)
+ * VBI & EBU (Teletext) support (*nix, Mac OS)
- * Ogg/Kate subtitles support
- * AQTitle subtitles support
@@ -142 +145 @@
-
-Video outputs and filters:
- output module (Mac OS X 10.5
+-based output module (VLCKit framework on OS X
- * Adjust, Invert and Distort (now split into Wave, Ripple, Gradient and
-   Psychedelic) video filters can now be streamed
@@ -181 +184 @@
-
-Interfaces:
- * Windows/Linux
-   * Brand new interface for Linux and Windows, based on the Qt toolkit
- * All
-   * New Simple Preferences dialogs showing the most important settings in an
@@ -190 +191 @@
-   * Vastly improved Update checker
-   * Full support for meta data editing (ID3v2, Ogg/Vorbis, AAC, APEv1/2)
+ * Windows/Linux
+   * Brand new interface for Linux and Windows, based on the Qt toolkit
+   * Fullscreen controller (transparency on Linux+Composite)
- * Mac OS X
-   * Improved video output features
@@ -196 +200 @@
-   * When playing Radio (live) streams, the current track is shown correctly
-   * Correct appearance on Macs using Aqua's graphite theme
+   * Simplified Extended Controls panel
- * Ncurses:
-   * Correctly displays wide characters when using an UTF-8 locale, 
@@ -217 +222 @@
-
-Mac OS X Port:
-
+"VLCKit" 
-   applications (Google Summer of Code Student project, Mac OS X 10.5 only)
- * New text renderer based on Quartz replacing the existing Freetype solution
- * Complete compatibility with Mac OS X 10.5 Leopard
-   * It is now required to compile a fully featured build
-
+and QuickTime 6.x 
-
-LibVLC:
@@ -948 +953 @@
-   with support for effects.
- * Improved filter and subpictures support :
-   
-   
-   
+    
+    
+    
- * New filters : 
-   
-   
+    
+    
-
-Interfaces:

THANKS

@@ -148 +148 @@
-Loox Thefuture <loox.thefuture at gmail dot com> - Media key in X11 vout
-Lorena Gomes - Catalan translation
-qt4: full screen controller. teletext button fix
+Qt4: full screen controller. Teletext button fix. Various fixes
-Mahrazi Mohd Kamal <mahrazi at gmail.com> - Malay Translation
-Marc Nolette <nolette at videotron.ca> - PVR support in DirectShow input

configure.ac

@@ -5591 +5591 @@
-
-dnl
-dnl Microsoft Layer for Unicode for WIN9x/ME
-dnl
-if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
-then
-    AC_CHECK_LIB(unicows, LoadUnicowsSymbol, [
-        VLC_ADD_LDFLAGS([vlc libvlc],[-Wl,--exclude-libs,libunicows.a -lunicows])
-    ])
-fi
-
-dnl
-dnl  gtk_main plugin
-dnl

extras/contrib/src/Distributions/win32.mak

@@ -6 +6 @@
-        .png .gpg-error .gcrypt .opencdk .gnutls .mpcdec \
-        .dvdnav .dvbpsi .wxwidgets .qt4_win32 .dirac .SDL_image \
-unicows .
+
-        .lua .tag .fontconfig .portaudio \
-        .aclocal

extras/contrib/src/Makefile

@@ -2313 +2313 @@
-
-# ***************************************************************************
-# UNICOWS (Unicode support for WINME/98/95)
-# ***************************************************************************
-
-libunicows-$(UNICOWS_VERSION).tar.gz:
-    $(WGET) $(UNICOWS_URL)
-    mv libunicows-$(UNICOWS_VERSION)-src.tar.gz $@ || true
-
-libunicows: libunicows-$(UNICOWS_VERSION).tar.gz
-    $(EXTRACT_GZ)
-
-.unicows: libunicows
-    (cd $</src; make -f makefile.mingw32 PATHSEP='/' $(HOSTCC) && cp -f ../lib/mingw32/libunicows.a $(PREFIX)/lib)
-    touch $@
-
-CLEAN_FILE += .unicows
-CLEAN_PKG += libunicows
-DISTCLEAN_PKG += libunicows-$(UNICOWS_VERSION).tar.gz
-
-# ***************************************************************************
-# TagLib read and editing of tags of popular audio formats
-# ***************************************************************************

extras/contrib/src/packages.mak

@@ -209 +209 @@
-PTHREADS_VERSION=2-8-0
-PTHREADS_URL=ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
-UNICOWS_VERSION=1.1.1
-UNICOWS_URL=$(SF)/libunicows/libunicows-$(UNICOWS_VERSION)-src.tar.gz
-ZVBI_VERSION=0.2.30
-ZVBI_URL=$(SF)/zapping/zvbi-$(ZVBI_VERSION).tar.bz2

extras/package/win32/vlc.win32.nsi.in

@@ -638 +638 @@
-  !insertmacro MUI_LANGDLL_DISPLAY
-
-  ;Win98 detection
-  ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
-  StrCmp $R0 "4.9" lbl_win98
-
-  lbl_win98:
-     MessageBox MB_OK|MB_ICONQUESTION "Windows 98 ! Remember to install MSLU" IDOK
-
-FunctionEnd
-

include/vlc_interface.h

@@ -178 +178 @@
-
-#define EXTENSIONS_AUDIO "*.a52;*.aac;*.ac3;*.dts;*.flac;*.m4a;*.m4p;*.mka;" \
-
+
+
-
-#define EXTENSIONS_VIDEO "*.asf;*.avi;*.divx;*.dv;*.flv;*.gxf;*.m1v;*.m2v;" \

modules/gui/qt4/components/interface_widgets.cpp

@@ -66 +66 @@
-    videoSize.rwidth() = -1;
-    videoSize.rheight() = -1;
+    setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
-
-    /* Black background is more coherent for a Video Widget IMVHO */
@@ -75 +76 @@
-
-    /* The core can ask through a callback to show the video. */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -116 +124 @@
-{
-    msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y );
-
+ *pi_width, *pi_height 
-    if( p_vout )
-    {
@@ -135 +143 @@
-    videoSize.rwidth() = w;
-    videoSize.rheight() = h;
+    if( isHidden() ) show();
-    updateGeometry(); // Needed for deinterlace
-}
@@ -462 +471 @@
-    BUTTON_SET_IMG( prevSectionButton, "", previous.png, "" );
-    BUTTON_SET_IMG( nextSectionButton, "", next.png, "" );
-""
+qtr( "Menu" )
-
-    discFrame->hide();
@@ -722 +731 @@
-void ControlsWidget::setNavigation( int navigation )
-{
-#define HELP_MENU N_( "Menu" )
-#define HELP_PCH N_( "Previous chapter" )
-#define HELP_NCH N_( "Next chapter" )
-#define HELP_PTR N_( "Previous track" )
-#define HELP_NTR N_( "Next track" )
-
-    // 1 = chapter, 2 = title, 0 = no
@@ -873 +879 @@
-        : ControlsWidget( _p_i, _p_mi, b_advControls, b_shiny, true ),
-        i_lastPosX( -1 ), i_lastPosY( -1 ), i_hideTimeout( 1 ),
-
+, b_isFullscreen( false )
-{
-    setWindowFlags( Qt::ToolTip );
@@ -971 +977 @@
-    else
-    {
+#ifdef WIN32TRICK
+         if ( windowOpacity() > 0.0 && !fscHidden )
+#else
-         if ( windowOpacity() > 0.0 )
+#endif
-         {
-             /* we should use 0.01 because of 100 pieces ^^^
@@ -1008 +1018 @@
-    int type = event->type();
-
-
+&& b_isFullscreen 
-    {
-        #ifdef WIN32TRICK
@@ -1145 +1155 @@
-    if ( var_GetBool( p_vout, "fullscreen" ) && !b_registered )
-    {
-
+
+
-        var_AddCallback( p_vout, "mouse-moved",
-                        showFullscreenControllCallback, (void *) p_fs );
@@ -1153 +1164 @@
-    if ( !var_GetBool( p_vout, "fullscreen" ) && b_registered )
-    {
+        p_fs->setIsFullscreen( false );
+        p_fs->hide();
-        var_DelCallback( p_vout, "mouse-moved",
-                        showFullscreenControllCallback, (void *) p_fs );
-        b_registered = false;
-    }
-
-    if ( !var_GetBool( p_vout, "fullscreen" ) )
-        p_fs->hide();
-
-    return VLC_SUCCESS;

modules/gui/qt4/components/interface_widgets.hpp

@@ -92 +92 @@
-
-signals:
-
-
+
-
-public slots:
@@ -252 +251 @@
-    virtual ~FullscreenControllerWidget();
-
-
+
+
-    void regFullscreenCallback( vout_thread_t *p_vout );
-
@@ -285 +285 @@
-    int i_hideTimeout;  /* FSC hiding timeout, same as mouse hiding timeout */
-    bool b_mouseIsOver;
+    bool b_isFullscreen;
-
-#ifdef WIN32TRICK

modules/gui/qt4/components/open_panels.cpp

@@ -411 +411 @@
-
-    /* CONNECTs */
-currentIndexChang
+activat
-             this, updateProtocol( int ) );
-    CONNECT( ui.portSpin, valueChanged( int ), this, updateMRL() );
@@ -418 +418 @@
-    CONNECT( ui.ipv6, clicked(), this, updateMRL());
-
+    ui.protocolCombo->addItem( "" );
-    ui.protocolCombo->addItem("HTTP", QVariant("http"));
-    ui.protocolCombo->addItem("HTTPS", QVariant("https"));
@@ -425 +426 @@
-    ui.protocolCombo->addItem("UDP/RTP (unicast)", QVariant("udp"));
-    ui.protocolCombo->addItem("UDP/RTP (multicast)", QVariant("udp"));
+    ui.protocolCombo->addItem("RTMP", QVariant("rtmp"));
-}
-
@@ -434 +436 @@
-
-/* update the widgets according the type of protocol */
-
+_proto
-    QString addr = ui.addressText->text();
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    /* If we already have a protocol in the address, replace it */
-
-
-
+
+
+
+
+
+
-        ui.addressText->setText( addr );
-    }
@@ -456 +465 @@
-    QString addr = ui.addressText->text();
-    addr = QUrl::toPercentEncoding( addr, ":/?#@!$&'()*+,;=" );
-
-
- && ( proto != 5 || proto != 6 ) 
+idx_
+
+
-    {
-
+
+
+
+
+
+
-    }
-    else
-    {
-
-0
+idx_
+HTTP_PROTO
-            mrl = "http://" + addr;
-            emit methodChanged("http-caching");
-            break;
-1
+HTTPS_PROTO
-            mrl = "https://" + addr;
-            emit methodChanged("http-caching");
-            break;
-3
+MMS_PROTO
-            mrl = "mms://" + addr;
-            emit methodChanged("mms-caching");
-            break;
-2
+FTP_PROTO
-            mrl = "ftp://" + addr;
-            emit methodChanged("ftp-caching");
-            break;
-4: /* RTSP */
+RTSP_PROTO:
-            mrl = "rtsp://" + addr;
-            emit methodChanged("rtsp-caching");
-            break;
-5
+UDP_PROTO
-            mrl = "udp://@";
-            if( ui.ipv6->isEnabled() && ui.ipv6->isChecked() )
@@ -494 +508 @@
-            emit methodChanged("udp-caching");
-            break;
-6
+UDPM_PROTO
-            mrl = "udp://@";
-            /* Add [] to IPv6 */
@@ -504 +518 @@
-            mrl += QString(":%1").arg( ui.portSpin->value() );
-            emit methodChanged("udp-caching");
+        case RTMP_PROTO:
+            mrl = "rtmp://" + addr;
+            emit methodChanged("rtmp-caching");
+            break;
+
-        }
-    }
@@ -908 +927 @@
-
-    /* General connects */
-connect( ui.deviceCombo, SIGNAL( activated( int ) )
-        stackedDevLayout, SLOT( setCurrentIndex( int )
-connect( ui.deviceCombo, SIGNAL( activated( int )
-        stackedPropLayout, SLOT( setCurrentIndex( int )
+CONNECT( ui.deviceCombo, activated( int ) 
+stackedDevLayout, setCurrentIndex( int
+CONNECT( ui.deviceCombo, activated( int
+stackedPropLayout, setCurrentIndex( int
-    CONNECT( ui.deviceCombo, activated( int ), this, updateMRL() );
-    CONNECT( ui.deviceCombo, activated( int ), this, updateButtons() );
@@ -1115 +1134 @@
-    advButtonBox->addButton( cancelButton, QDialogButtonBox::RejectRole );
-
-gLayout->addWidget( advButtonBox, i_confsize + 1, 0, 1, -1 
+mainLayout->addWidget( advButtonBox
-
-    /* Creation of the MRL */

modules/gui/qt4/components/open_panels.hpp

@@ -48 +48 @@
-#define setSpinBoxFreq( spinbox ){ spinbox->setRange ( 0, INT_MAX ); \
-    spinbox->setAccelerated( true ); }
+
+enum
+{
+    NO_PROTO,
+    HTTP_PROTO,
+    HTTPS_PROTO,
+    MMS_PROTO,
+    FTP_PROTO,
+    RTSP_PROTO,
+    UDP_PROTO,
+    UDPM_PROTO,
+    RTMP_PROTO
+};
+
-
-enum

modules/gui/qt4/dialogs/help.cpp

@@ -293 +293 @@
-            updateLabel->setText( qtr( "There is a new version of VLC :\n" )
-                                + qfu( p_release->psz_desc )  );
+
+            /* Force the dialog to be shown */
+            this->show();
-        }
-        else

modules/gui/qt4/main_interface.cpp

@@ -437 +437 @@
-    {
-        videoWidget = new VideoWidget( p_intf );
-
-
-
-
-
-
+
-    }
-
@@ -660 +655 @@
- * This is wrong, and this is TEH reason to emit signals on those Video Functions
- **/
-/* function called from ::DoRequest in order to show a nice VideoWidget
-    at the good size */
-void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
-                                   int *pi_y, unsigned int *pi_width,
@@ -693 +686 @@
-        videoIsActive = true;
-
-
+//
-        emit askUpdate();
-
@@ -701 +694 @@
-}
-
-/* function called from ::DoRequest in order to show a nice VideoWidget
-    at the good size */
-void MainInterface::requestNotEmbeddedVideo( vout_thread_t *p_nvout )
-{

modules/gui/qt4/qt4.cpp

@@ -30 +30 @@
-#include <QTranslator>
-#include <QDate>
+#include <QMutex>
+#include <QMutexLocker>
+#include <QWaitCondition>
+#include <QPointer>
-
-#include "qt4.hpp"
@@ -92 +96 @@
-#define OPACITY_TEXT N_( "Windows opacity between 0.1 and 1." )
-#define OPACITY_LONGTEXT N_( "Sets the windows opacity between 0.1 and 1 " \
- 
+
-                             " This option only works with Windows and " \
-                             "X11 with composite extensions." )
@@ -229 +233 @@
-#endif
-
+    /* Allocations */
-    p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
-    if( !p_intf->p_sys )
@@ -236 +241 @@
-    p_intf->pf_run = Run;
-
+    /* Access to the playlist */
-    p_intf->p_sys->p_playlist = pl_Yield( p_intf );
+    /* Listen to the messages */
-    p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
-
+    var_Create( p_this, "window_widget", VLC_VAR_ADDRESS );
-    return VLC_SUCCESS;
-}
@@ -289 +297 @@
-}
-
+static QMutex windowLock;
+static QWaitCondition windowWait;
+
-static void Init( intf_thread_t *p_intf )
-{
+    vlc_value_t val;
-    char dummy[] = "";
-    char *argv[] = { dummy };
@@ -310 +322 @@
-    /* Start the QApplication here */
-    QApplication *app = new QApplication( argc, argv , true );
+    p_intf->p_sys->p_app = app;
+
+    /* Icon setting
+       FIXME: use a bigger icon ? */
-    if( QDate::currentDate().dayOfYear() >= 354 )
-        app->setWindowIcon( QIcon( QPixmap(vlc_christmas_xpm) ) );
-    else
-        app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
-
-
-
+
+
-    DialogsProvider::getInstance( p_intf );
-
-
+
+
+
-    if( !p_intf->pf_show_dialog )
-    {
-
-
+
-        /* We don't show it because it is done in the MainInterface constructor
-        p_mi->show(); */
-        p_intf->p_sys->b_isDialogProvider = false;
+
+        miP = new QPointer<MainInterface> (p_intf->p_sys->p_mi);
+        val.p_address = miP;
+        QMutexLocker locker (&windowLock);
+        var_Set (p_intf, "window_widget", val);
+        windowWait.wakeAll ();
-    }
-    else
@@ -334 +356 @@
-    }
-
+    /* Explain to the core how to show a dialog :D */
+    p_intf->pf_show_dialog = ShowDialog;
-
-#ifdef ENABLE_NLS
@@ -354 +378 @@
-#endif  //ENABLE_NLS
-
-    /* Explain to the core how to show a dialog :D */
-    p_intf->pf_show_dialog = ShowDialog;
-
-    /* Last settings */
-    app->setQuitOnLastWindowClosed( false );
-
-       r
+R
-    char *psz_path = config_GetPsz( p_intf, "qt-filedialog-path" );
-    p_intf->p_sys->psz_filepath = EMPTY_STR( psz_path ) ? psz_path
-
+                             
-
-#ifdef UPDATE_CHECK
@@ -386 +407 @@
-    /* And quit */
-
+    if (miP)
+    {
+        QMutexLocker locker (&windowLock);
+        val.p_address = NULL;
+        var_Set (p_intf, "window_widget", val);
+        delete miP;
+    }
+
-    /* Destroy first the main interface because it is connected to some slots
-       in the MainInputManager */
@@ -397 +426 @@
-    MainInputManager::killInstance();
-
+    /* Delete the application */
-    delete app;
-
+    /* Save the path */
-    config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
-    free( psz_path );
@@ -436 +467 @@
-{
-    vout_window_t *wnd = (vout_window_t *)obj;
-
-    /* TODO: should probably be in the libvlc core instead: */
-    if (!config_GetInt (obj, "embedded-video"))
-        return VLC_EGENERIC;
-
-    intf_thread_t *intf = (intf_thread_t *)
@@ -447 +474 @@
-    assert (intf->i_object_type == VLC_OBJECT_INTF);
-
-    var_Create (intf, "window_mutex", VLC_VAR_MUTEX);
-    var_Create (intf, "window_widget", VLC_VAR_ADDRESS);
-
-
-
-
-
+
+
+
-    msg_Dbg (obj, "waiting for interface...");
-do
+for (;;)
-    {
-        var_Get (intf, "window_widget", &ptrval);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    wnd->control = ControlWindow;
-intf
+miP
-    return VLC_SUCCESS;
-}
@@ -475 +512 @@
-static int ControlWindow (vout_window_t *wnd, int query, va_list args)
-{
-
-
+
+
+
+
+
+
-}
-
@@ -482 +523 @@
-{
-    vout_window_t *wnd = (vout_window_t *)obj;
-
-
-
-
-
+
+
+
+
+
+
+

modules/gui/qt4/ui/open_capture.ui

@@ -8 +8 @@
-    <y>0</y>
-    <width>358</width>
-63
+77
-   </rect>
-  </property>
@@ -53 +53 @@
-    </widget>
-   </item>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    <widget class="QPushButton" name="advancedButton" >
-     <property name="toolTip" >
@@ -63 +79 @@
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="4" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::MinimumExpanding</enum>