Changeset 18efcf5c6416d6c8b927ea2beef6f3069fac71f4

Timestamp:

09/23/06 15:37:50 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1159018670 +0000

git-parent:

[f4978776e4fd252f184b111fddcec555ef0f75d4]

git-author:

Clément Stenac <zorglub@videolan.org> 1159018670 +0000

Message:

* Add switch to skins
* Fixes to dialog singletons
* Forgotten files (definitions of aout_Visual*, unimplemented at the moment)

Files:

• extras/contrib/src/Makefile (modified) (1 diff)
• include/audio_output.h (modified) (1 diff)
• include/vlc_symbols.h (modified) (3 diffs)
• modules/gui/qt4/dialogs/streaminfo.hpp (modified) (1 diff)
• modules/gui/qt4/dialogs_provider.cpp (modified) (1 diff)
• modules/gui/qt4/dialogs_provider.hpp (modified) (2 diffs)
• modules/gui/qt4/main_interface.cpp (modified) (1 diff)
• modules/gui/qt4/menus.cpp (modified) (1 diff)
• modules/gui/qt4/qt4.cpp (modified) (2 diffs)
• src/audio_output/intf.c (modified) (1 diff)
• src/libvlc-common.c (modified) (2 diffs)
• src/libvlc.c (modified) (1 diff)
• src/libvlc.h (modified) (1 diff)

extras/contrib/src/Makefile

@@ -1028 +1028 @@
-    (cd $@; ./autogen.sh noconfig)
-
- .dvdcss
+
-ifdef HAVE_WIN32    
---with-libdvdcss=$(PREFIX) 
-
---with-libdvdcss=$(PREFIX)
+
+
+
-endif
-    $(INSTALL_NAME)

include/audio_output.h

@@ -201 +201 @@
-VLC_EXPORT( int, aout_FindAndRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );
-VLC_EXPORT( int, aout_ChannelsRestart, ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ) );
+
-VLC_EXPORT( void, aout_EnableFilter, (vlc_object_t *, const char *, vlc_bool_t ));
-
+#define aout_VisualNext(a) aout_VisualChange( VLC_OBJECT(a),1 )
+#define aout_VisualPrev(a) aout_VisualChange( VLC_OBJECT(a),-1 )
+
+VLC_EXPORT( char *, aout_VisualChange, (vlc_object_t *, int ) );
+
-#endif /* _VLC_AUDIO_OUTPUT_H */

include/vlc_symbols.h

@@ -538 +538 @@
-    void (*aout_EnableFilter_inner) (vlc_object_t *, const char *, vlc_bool_t);
-    void (*playlist_NodesPairCreate_inner) (playlist_t *, char *, playlist_item_t **, playlist_item_t **, vlc_bool_t);
+    char * (*aout_VisualChange_inner) (vlc_object_t *, int);
-};
-# if defined (__PLUGIN__)
@@ -1009 +1010 @@
-#  define aout_EnableFilter (p_symbols)->aout_EnableFilter_inner
-#  define playlist_NodesPairCreate (p_symbols)->playlist_NodesPairCreate_inner
+#  define aout_VisualChange (p_symbols)->aout_VisualChange_inner
-# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1483 +1485 @@
-    ((p_symbols)->aout_EnableFilter_inner) = aout_EnableFilter; \
-    ((p_symbols)->playlist_NodesPairCreate_inner) = playlist_NodesPairCreate; \
+    ((p_symbols)->aout_VisualChange_inner) = aout_VisualChange; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->__playlist_ItemNew_deprecated = NULL; \

modules/gui/qt4/dialogs/streaminfo.hpp

@@ -41 +41 @@
-        return instance;
-    }
-
+
+
+
+
+
-    virtual ~StreamInfoDialog();
-    bool need_update;

modules/gui/qt4/dialogs_provider.cpp

@@ -300 +300 @@
-}
-
+void DialogsProvider::switchToSkins()
+{
+    var_SetString( p_intf, "intf-switch", "skins2" );
+}
+
-void DialogsProvider::bookmarksDialog()
-{

modules/gui/qt4/dialogs_provider.hpp

@@ -53 +53 @@
-        return instance;
-    }
-
+
+
+
+
+
-    virtual ~DialogsProvider();
-    QTimer *fixed_timer;
@@ -92 +96 @@
-    void openMLDirectory();
-    void quit();
+    void switchToSkins();
-};
-

modules/gui/qt4/main_interface.cpp

@@ -625 +625 @@
-    {
-        QApplication::closeAllWindows();
-        DialogsProvider::killInstance();
-        QApplication::quit();
-    }

modules/gui/qt4/menus.cpp

@@ -199 +199 @@
-
-    QMenu *menu = Populate( p_intf, current, varnames, objects );
+
+    if( !p_intf->pf_show_dialog )
+    {
+        menu->addSeparator();
+        menu->addAction( qtr("Switch to skins"), THEDP, SLOT(switchToSkins()) );
+    }
+
-    CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );
-    THEDP->menusUpdateMapper->setMapping( menu, 4 );
-
-    return menu;
-}

modules/gui/qt4/qt4.cpp

@@ -140 +140 @@
-    app->exec();
-    MainInputManager::killInstance();
+    DialogsProvider::killInstance();
-    delete p_intf->p_sys->p_mi;
-}
@@ -150 +151 @@
-{
-    DialogEvent *event = new DialogEvent( i_dialog_event, i_arg, p_arg );
-
-
+
-}
-

src/audio_output/intf.c

@@ -530 +530 @@
-    free( psz_string );
-}
+
+/**
+ * Change audio visualization
+ * -1 goes backwards, +1 goes forward
+ */
+char *aout_VisualChange( vlc_object_t *p_this, int i_skip )
+{
+    return strdup("foobar");
+}

src/libvlc-common.c

@@ -1 +1 @@
-/*****************************************************************************
-
+, interfaces handling
- *****************************************************************************
- * Copyright (C) 1998-2006 the VideoLAN team
@@ -162 +162 @@
-    var_Get( p_libvlc_global, "libvlc", &lockval );
-    vlc_mutex_lock( lockval.p_address );
+
+    
-
-    i_instances++;

src/libvlc.c

@@ -1 +1 @@
-/*****************************************************************************
-main libvlc source
+Implementation of the old libvlc API
- *****************************************************************************
- * Copyright (C) 1998-2006 the VideoLAN team

src/libvlc.h

@@ -1 +1 @@
-/*****************************************************************************
-main libvlc header
+Options for the main module
- *****************************************************************************
- * Copyright (C) 1998-2006 the VideoLAN team