[vlc-devel] Needing help
Moussa Kandalaf
kulent at gmail.com
Mon Jul 28 15:50:38 CEST 2008
I everyone, I did everything you put here and I got this:
java -classpath jna-3.0.2.jar:jvlc-core-0.9.0-SNAPSHOT.jar
-Djna.library.path=/opt/vlc-plugins-2008-07-27
org.videolan.jvlc.example.VLCExample
== Starting VLCExample ==
Creating a JVLC instance without args[00000001] main libvlc debug: VLC media
player - version 0.9.0-test3 Grishenko - (c) 1996-2008 the VideoLAN team
[00000001] main libvlc debug: libvlc was configured with ./configure
'--prefix=/opt/vlc-git-2008-07-27' '--build=i386-linux' '--disable-qt4'
'--disable-wxwidgets' '--disable-activex' '--disable-vcdx' '--disable-cddax'
'--disable-mozilla' '--disable-gtk' '--disable-hal' '--disable-libcdio'
'--disable-skins2' '--disable-portaudio' '--enable-nls' '--enable-ffmpeg'
'--with-ffmpeg-faad' '--with-ffmpeg-mp3lame' '--with-ffmpeg-faac'
'--with-ffmpeg-zlib' '--with-ffmpeg-a52' '--with-ffmpeg-theora'
'--with-ffmpeg-vorbis' '--enable-theora' '--enable-faad' '--enable-twolame'
'--enable-dv' '--enable-dvdread' '--disable-live555' '--enable-caca'
'--enable-goom' '--enable-real' '--enable-realrtsp' '--enable-mkv'
'--enable-shout' '--enable-dvb' '--enable-dvbpsi' '--enable-v4l'
'--enable-dvdnav' '--enable-a52' '--enable-libmpeg2' '--enable-vorbis'
'--enable-flac' '--enable-sout' '--enable-ogg' '--enable-vlm' '--enable-mad'
'--enable-libtool' '--enable-shared' '--enable-x264'
'--enable-shared-libvlc' 'build_alias=i386-linux'
[00000001] main libvlc debug: translation test: code is "C"
[00000351] inhibit interface error: Failed to connect to the D-Bus session
daemon: Did not receive a reply. Possible causes include: the remote
application did not send a reply, the message bus security policy blocked
the reply, the reply timeout expired, or the network connection was broken.
[00000351] main interface error: no suitable interface module
[00000001] main libvlc error: interface "inhibit,none" initialization failed
... done.
Exception in thread "main" java.lang.NoClassDefFoundError:
org/slf4j/LoggerFactory
at
org.videolan.jvlc.event.MediaPlayerCallback.<init>(MediaPlayerCallback.java:49)
at org.videolan.jvlc.MediaPlayer.addListener(MediaPlayer.java:156)
at org.videolan.jvlc.example.VLCExample.main(VLCExample.java:35)
Caused by: java.lang.ClassNotFoundException: org.slf4j.LoggerFactory
at java.net.URLClassLoader$1.run(URLClassLoader.java:217)
at java.security.AccessController.doPrivileged(Native Method)
at java.net.URLClassLoader.findClass(URLClassLoader.java:205)
at java.lang.ClassLoader.loadClass(ClassLoader.java:323)
at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:294)
at java.lang.ClassLoader.loadClass(ClassLoader.java:268)
at java.lang.ClassLoader.loadClassInternal(ClassLoader.java:336)
... 3 more
I'm running vlc under ubuntu 8.04.1
Does any knows what can I do to fix this problem and make run the example?
Thanks
On Mon, Jul 28, 2008 at 3:50 AM, <vlc-devel-request at videolan.org> wrote:
> Send vlc-devel mailing list submissions to
> vlc-devel at videolan.org
>
> To subscribe or unsubscribe via the World Wide Web, visit
> http://mailman.videolan.org/listinfo/vlc-devel
> or, via email, send a message with subject or body 'help' to
> vlc-devel-request at videolan.org
>
> You can reach the person managing the list at
> vlc-devel-owner at videolan.org
>
> When replying, please edit your Subject line so it is more specific
> than "Re: Contents of vlc-devel digest..."
>
>
> Today's Topics:
>
> 1. commit: Fix most of the issues of the Equalizer.
> (Jean-Baptiste Kempf ) (git version control)
> 2. commit: Fix file mode (Jean-Baptiste Kempf ) (git version control)
> 3. commit: Remove Equalizer from the menu (as for the mac
> version) ( Jean-Baptiste Kempf ) (git version control)
> 4. commit: Qt Imageset update. (Jean-Baptiste Kempf )
> (git version control)
> 5. Re: commit: Qt Imageset update. (Jean-Baptiste Kempf )
> (Jean-Baptiste Kempf)
> 6. commit: Same icon for both information dialog in the menus. (
> Jean-Baptiste Kempf ) (git version control)
> 7. commit: Destroy preferences dialog on close and on reset. (
> Jean-Baptiste Kempf ) (git version control)
> 8. commit: We even can show a new dialog after reset the
> preferences. ( Jean-Baptiste Kempf ) (git version control)
> 9. commit: upnp_intel: Fix playlist locking. ( R?mi Duraffort )
> (git version control)
>
>
> ----------------------------------------------------------------------
>
> Message: 1
> Date: Mon, 28 Jul 2008 05:00:55 +0200 (CEST)
> From: git at videolan.org (git version control)
> Subject: [vlc-devel] commit: Fix most of the issues of the Equalizer.
> (Jean-Baptiste Kempf )
> To: <vlc-devel at videolan.org>
> Message-ID: <20080728030055.73FFE20D0D at skanda.videolan.org>
> Content-Type: text/plain; charset=UTF-8
>
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul 27
> 19:42:13 2008 -0700| [2cd6174f82a4c4861247cb68882caeb94b147d84]
>
> Fix most of the issues of the Equalizer.
>
> Fix most of the issues of the Equalizer.
>
> >
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2cd6174f82a4c4861247cb68882caeb94b147d84
> ---
>
> modules/gui/qt4/components/extended_panels.cpp | 121
> ++++++++++++++++--------
> modules/gui/qt4/components/extended_panels.hpp | 9 +-
> 2 files changed, 88 insertions(+), 42 deletions(-)
>
> Diff:
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=2cd6174f82a4c4861247cb68882caeb94b147d84
>
>
> ------------------------------
>
> Message: 2
> Date: Mon, 28 Jul 2008 05:00:55 +0200 (CEST)
> From: git at videolan.org (git version control)
> Subject: [vlc-devel] commit: Fix file mode (Jean-Baptiste Kempf )
> To: <vlc-devel at videolan.org>
> Message-ID: <20080728030055.84B8320DD8 at skanda.videolan.org>
> Content-Type: text/plain; charset=UTF-8
>
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul 27
> 20:03:30 2008 -0700| [569f330959679e1335da4f6520a399dcb155d23f]
>
> Fix file mode
>
> >
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=569f330959679e1335da4f6520a399dcb155d23f
> ---
>
> 0 files changed, 0 insertions(+), 0 deletions(-)
>
> diff --git a/modules/video_output/msw/wingdi.c
> b/modules/video_output/msw/wingdi.c
> old mode 100755
> new mode 100644
>
>
>
> ------------------------------
>
> Message: 3
> Date: Mon, 28 Jul 2008 05:31:10 +0200 (CEST)
> From: git at videolan.org (git version control)
> Subject: [vlc-devel] commit: Remove Equalizer from the menu (as for
> the mac version) ( Jean-Baptiste Kempf )
> To: <vlc-devel at videolan.org>
> Message-ID: <20080728033110.B845CB81A at skanda.videolan.org>
> Content-Type: text/plain; charset=UTF-8
>
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul 27
> 20:31:54 2008 -0700| [c6adecf5346037600a5f332f2c14d56b43abb354]
>
> Remove Equalizer from the menu (as for the mac version)
>
> Since the aout is destroyed when equalizer is activated, the callback
> registration doesn't work and only HACKs can solve that (msleep).
>
> Close #1740
>
> >
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c6adecf5346037600a5f332f2c14d56b43abb354
> ---
>
> modules/gui/qt4/components/extended_panels.cpp | 12 ------------
> modules/gui/qt4/menus.cpp | 2 --
> 2 files changed, 0 insertions(+), 14 deletions(-)
>
> diff --git a/modules/gui/qt4/components/extended_panels.cpp
> b/modules/gui/qt4/components/extended_panels.cpp
> index 6cc7a34..ca7d471 100644
> --- a/modules/gui/qt4/components/extended_panels.cpp
> +++ b/modules/gui/qt4/components/extended_panels.cpp
> @@ -917,18 +917,6 @@ void Equalizer::enable( bool en )
> {
> bands[i]->setEnabled( en ); band_texts[i]->setEnabled( en );
> }
> -
> -#if 0
> - msleep( 10000 );
> -
> - aout_instance_t *p_aout= ( aout_instance_t * )vlc_object_find( p_intf,
> - VLC_OBJECT_AOUT, FIND_ANYWHERE );
> - if( en )
> - addCallbacks( p_aout );
> - else
> - delCallbacks( p_aout );
> -#endif
> -
> }
>
> /* Function called when the set2Pass button is activated */
> diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
> index 4b5d39a..d8254b7 100644
> --- a/modules/gui/qt4/menus.cpp
> +++ b/modules/gui/qt4/menus.cpp
> @@ -217,7 +217,6 @@ static int AudioAutoMenuBuilder( vlc_object_t
> *p_object,
> PUSH_INPUTVAR( "audio-es" );
> PUSH_VAR( "audio-device" );
> PUSH_VAR( "audio-channels" );
> - PUSH_VAR( "equalizer" );
> PUSH_VAR( "visual" );
> return VLC_SUCCESS;
> }
> @@ -457,7 +456,6 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf,
> QMenu * current )
> ACT_ADD( current, "audio-es", qtr( "Audio &Track" ) );
> ACT_ADD( current, "audio-device", qtr( "Audio &Device" ) );
> ACT_ADD( current, "audio-channels", qtr( "Audio &Channels" ) );
> - ACT_ADD( current, "equalizer", qtr( "&Equalizer" ) );
> current->addSeparator();
> ACT_ADD( current, "visual", qtr( "&Visualizations" ) );
> }
>
>
>
> ------------------------------
>
> Message: 4
> Date: Mon, 28 Jul 2008 08:25:34 +0200 (CEST)
> From: git at videolan.org (git version control)
> Subject: [vlc-devel] commit: Qt Imageset update. (Jean-Baptiste Kempf
> )
> To: <vlc-devel at videolan.org>
> Message-ID: <20080728062534.664AB20D0D at skanda.videolan.org>
> Content-Type: text/plain; charset=UTF-8
>
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul 27
> 23:26:46 2008 -0700| [b5077c0ef45f56e5b4126f78b71aadecf8f2857f]
>
> Qt Imageset update.
> - Add alias for most of the pixmpas. Separate in different folders.
> - Change some pixmaps
> - Close most of #852
> - Close #1799
> - Close #1780
>
> >
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b5077c0ef45f56e5b4126f78b71aadecf8f2857f
> ---
>
> modules/gui/qt4/Modules.am | 121
> ++++++++++--------
> .../gui/qt4/components/complete_preferences.cpp | 14 +-
> modules/gui/qt4/components/extended_panels.cpp | 5 +-
> modules/gui/qt4/components/interface_widgets.cpp | 64 +++++----
> modules/gui/qt4/components/open_panels.cpp | 3 +-
> .../gui/qt4/components/playlist/playlist_item.cpp | 2 -
> .../gui/qt4/components/playlist/playlist_model.cpp | 18 ++--
> .../gui/qt4/components/playlist/standardpanel.cpp | 26 ++--
> modules/gui/qt4/components/simple_preferences.cpp | 2 +-
> modules/gui/qt4/dialogs/vlm.cpp | 24 ++--
> modules/gui/qt4/dialogs/vlm.hpp | 1 -
> modules/gui/qt4/menus.cpp | 66 +++++-----
> modules/gui/qt4/pixmaps/arrow_down_dark.png | Bin 0 -> 229 bytes
> modules/gui/qt4/pixmaps/clear.png | Bin 0 -> 343 bytes
> modules/gui/qt4/pixmaps/eject.png | Bin 0 -> 246 bytes
> .../{menus_help_16px.png => menus/help_16px.png} | Bin 832 -> 832 bytes
> .../{menus_info_16px.png => menus/info_16px.png} | Bin 803 -> 803 bytes
> .../messages_16px.png} | Bin 347 -> 347 bytes
> .../gui/qt4/pixmaps/{ => menus}/playlist_16px.png | Bin 450 -> 450 bytes
> .../preferences_16px.png} | Bin 739 -> 739 bytes
> .../{menus_quit_16px.png => menus/quit_16px.png} | Bin 678 -> 678 bytes
> .../settings_16px.png} | Bin 417 -> 417 bytes
> .../stream_16px.png} | Bin 276 -> 276 bytes
> modules/gui/qt4/pixmaps/playlist.png | Bin 162 -> 0 bytes
> .../pixmaps/{playlist_add.png => playlist/add.png} | Bin 262 -> 262 bytes
> modules/gui/qt4/pixmaps/playlist/playlist.png | Bin 0 -> 2934 bytes
> .../repeat_all.png} | Bin 304 -> 304 bytes
> .../repeat_off.png} | Bin 314 -> 314 bytes
> .../repeat_one.png} | Bin 325 -> 325 bytes
> .../shuffle_off.png} | Bin 277 -> 277 bytes
> .../shuffle_on.png} | Bin 358 -> 358 bytes
> .../gui/qt4/pixmaps/{ => prefs}/advprefs_audio.png | Bin 464 -> 464 bytes
> .../gui/qt4/pixmaps/{ => prefs}/advprefs_codec.png | Bin 784 -> 784 bytes
> .../qt4/pixmaps/{ => prefs}/advprefs_extended.png | Bin 374 -> 374 bytes
> .../gui/qt4/pixmaps/{ => prefs}/advprefs_intf.png | Bin 348 -> 348 bytes
> .../qt4/pixmaps/{ => prefs}/advprefs_playlist.png | Bin 447 -> 447 bytes
> .../gui/qt4/pixmaps/{ => prefs}/advprefs_sout.png | Bin 433 -> 433 bytes
> .../gui/qt4/pixmaps/{ => prefs}/advprefs_video.png | Bin 294 -> 294 bytes
> .../pixmaps/{ => prefs}/spref_cone_Audio_64.png | Bin 5432 -> 5432
> bytes
> .../pixmaps/{ => prefs}/spref_cone_Hotkeys_64.png | Bin 6725 -> 6725
> bytes
> .../pixmaps/{ => prefs}/spref_cone_Input_64.png | Bin 5848 -> 5848
> bytes
> .../{ => prefs}/spref_cone_Interface_64.png | Bin 4693 -> 4693
> bytes
> .../{ => prefs}/spref_cone_Subtitles_64.png | Bin 5087 -> 5087
> bytes
> .../pixmaps/{ => prefs}/spref_cone_Video_64.png | Bin 5718 -> 5718
> bytes
> modules/gui/qt4/pixmaps/toolbar/atob.png | Bin 0 -> 453 bytes
> modules/gui/qt4/pixmaps/toolbar/atob_noa.png | Bin 0 -> 500 bytes
> modules/gui/qt4/pixmaps/toolbar/atob_nob.png | Bin 0 -> 498 bytes
> modules/gui/qt4/pixmaps/toolbar/dvd_menu.png | Bin 0 -> 246 bytes
> modules/gui/qt4/pixmaps/toolbar/dvd_next.png | Bin 0 -> 371 bytes
> modules/gui/qt4/pixmaps/toolbar/dvd_prev.png | Bin 0 -> 360 bytes
> .../qt4/pixmaps/{ => toolbar}/extended_16px.png | Bin 322 -> 322 bytes
> modules/gui/qt4/pixmaps/toolbar/fullscreen.png | Bin 0 -> 441 bytes
> .../gui/qt4/pixmaps/{ => toolbar}/record_16px.png | Bin 688 -> 688 bytes
> modules/gui/qt4/pixmaps/toolbar/snapshot.png | Bin 0 -> 463 bytes
> modules/gui/qt4/pixmaps/{ => toolbar}/tv.png | Bin 257 -> 257 bytes
> .../pixmaps/{ => toolbar}/tvtelx-transparent.png | Bin 336 -> 336 bytes
> modules/gui/qt4/pixmaps/{ => toolbar}/tvtelx.png | Bin 325 -> 325 bytes
> .../gui/qt4/pixmaps/{ => toolbar}/volume-high.png | Bin 573 -> 573 bytes
> .../gui/qt4/pixmaps/{ => toolbar}/volume-low.png | Bin 365 -> 365 bytes
> .../qt4/pixmaps/{ => toolbar}/volume-medium.png | Bin 576 -> 576 bytes
> .../gui/qt4/pixmaps/{ => toolbar}/volume-muted.png | Bin 549 -> 549 bytes
> .../pixmaps/{ => toolbar}/volume-slider-inside.png | Bin 270 -> 270 bytes
> .../{ => toolbar}/volume-slider-outside.png | Bin 1009 -> 1009
> bytes
> .../qt4/pixmaps/{ => toolbar}/volume-slider.svg | 0
> .../qt4/pixmaps/{ => types}/capture-card_16px.png | Bin 323 -> 323 bytes
> modules/gui/qt4/pixmaps/{ => types}/cdda_16px.png | Bin 674 -> 674 bytes
> modules/gui/qt4/pixmaps/{ => types}/disc_16px.png | Bin 964 -> 964 bytes
> .../gui/qt4/pixmaps/{ => types}/file-asym_16px.png | Bin 406 -> 406 bytes
> .../gui/qt4/pixmaps/{ => types}/file-wide_16px.png | Bin 405 -> 405 bytes
> .../qt4/pixmaps/{ => types}/folder-blue_16px.png | Bin 246 -> 246 bytes
> .../qt4/pixmaps/{ => types}/folder-grey_16px.png | Bin 204 -> 204 bytes
> .../gui/qt4/pixmaps/{ => types}/harddisk_16px.png | Bin 579 -> 579 bytes
> .../gui/qt4/pixmaps/{ => types}/network_16px.png | Bin 243 -> 243 bytes
> modules/gui/qt4/pixmaps/{ => types}/tape_16px.png | Bin 313 -> 313 bytes
> .../gui/qt4/pixmaps/{ => types}/type_directory.png | Bin 521 -> 521 bytes
> modules/gui/qt4/pixmaps/{ => types}/type_file.png | Bin 702 -> 702 bytes
> modules/gui/qt4/pixmaps/{ => types}/type_net.png | Bin 790 -> 790 bytes
> modules/gui/qt4/pixmaps/{ => types}/type_node.png | Bin 426 -> 426 bytes
> .../gui/qt4/pixmaps/{ => types}/type_playlist.png | Bin 714 -> 714 bytes
> .../gui/qt4/pixmaps/{ => types}/type_unknown.xpm | 0
> modules/gui/qt4/pixmaps/update.png | Bin 0 -> 681 bytes
> modules/gui/qt4/qt4.hpp | 2 +-
> modules/gui/qt4/util/input_slider.cpp | 4 +-
> modules/gui/qt4/vlc.qrc | 135
> +++++++++++---------
> 84 files changed, 253 insertions(+), 234 deletions(-)
>
> Diff:
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=b5077c0ef45f56e5b4126f78b71aadecf8f2857f
>
>
> ------------------------------
>
> Message: 5
> Date: Sun, 27 Jul 2008 23:37:07 -0700
> From: Jean-Baptiste Kempf <jb at videolan.org>
> Subject: Re: [vlc-devel] commit: Qt Imageset update. (Jean-Baptiste
> Kempf )
> To: Mailing list for VLC media player developers
> <vlc-devel at videolan.org>
> Message-ID: <20080728063707.GA3789 at via.ecp.fr>
> Content-Type: text/plain; charset=us-ascii
>
> On Mon, Jul 28, 2008 at 08:25:34AM +0200, git version control wrote :
> > - Close #1799
> #1779
>
> --
> jb
>
>
>
> ------------------------------
>
> Message: 6
> Date: Mon, 28 Jul 2008 09:15:43 +0200 (CEST)
> From: git at videolan.org (git version control)
> Subject: [vlc-devel] commit: Same icon for both information dialog in
> the menus. ( Jean-Baptiste Kempf )
> To: <vlc-devel at videolan.org>
> Message-ID: <20080728071543.BFECA20CA8 at skanda.videolan.org>
> Content-Type: text/plain; charset=UTF-8
>
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul 27
> 23:45:05 2008 -0700| [76cd2393dca4b0b4022b5a0857800cc3e2b59434]
>
> Same icon for both information dialog in the menus.
>
> >
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=76cd2393dca4b0b4022b5a0857800cc3e2b59434
> ---
>
> modules/gui/qt4/menus.cpp | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
> index 77a76dc..5908752 100644
> --- a/modules/gui/qt4/menus.cpp
> +++ b/modules/gui/qt4/menus.cpp
> @@ -408,7 +408,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf,
> addDPStaticEntry( menu, qtr( I_MENU_MSG ), "",
> ":/messages", SLOT( messagesDialog() ),
> "Ctrl+M" );
> - addDPStaticEntry( menu, qtr( I_MENU_INFO ) , "", "",
> + addDPStaticEntry( menu, qtr( I_MENU_INFO ) , "", ":/info",
> SLOT( mediaInfoDialog() ), "Ctrl+I" );
> addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) , "",
> ":/info", SLOT( mediaCodecDialog() ), "Ctrl+J" );
>
>
>
> ------------------------------
>
> Message: 7
> Date: Mon, 28 Jul 2008 09:15:43 +0200 (CEST)
> From: git at videolan.org (git version control)
> Subject: [vlc-devel] commit: Destroy preferences dialog on close and
> on reset. ( Jean-Baptiste Kempf )
> To: <vlc-devel at videolan.org>
> Message-ID: <20080728071543.CF2C021039 at skanda.videolan.org>
> Content-Type: text/plain; charset=UTF-8
>
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jul 28
> 00:18:44 2008 -0700| [e28d5e8ac631a90c44bb75eb7cfd56f0fd2e6e2b]
>
> Destroy preferences dialog on close and on reset.
> Close #1777
>
> >
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e28d5e8ac631a90c44bb75eb7cfd56f0fd2e6e2b
> ---
>
> modules/gui/qt4/dialogs/preferences.cpp | 10 ++++++++--
> modules/gui/qt4/dialogs/preferences.hpp | 1 -
> 2 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/modules/gui/qt4/dialogs/preferences.cpp
> b/modules/gui/qt4/dialogs/preferences.cpp
> index aa57119..a841f70 100644
> --- a/modules/gui/qt4/dialogs/preferences.cpp
> +++ b/modules/gui/qt4/dialogs/preferences.cpp
> @@ -21,6 +21,7 @@
> * along with this program; if not, write to the Free Software
> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301,
> USA.
>
> *****************************************************************************/
> +
> #ifdef HAVE_CONFIG_H
> # include "config.h"
> #endif
> @@ -49,6 +50,10 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t
> *_p_intf )
> QGridLayout *main_layout = new QGridLayout( this );
> setWindowTitle( qtr( "Preferences" ) );
>
> + /* Whether we want it or not, we need to destroy on close to get
> + consistency when reset */
> + setAttribute( Qt::WA_DeleteOnClose );
> +
> /* Create Panels */
> tree_panel = new QWidget;
> tree_panel_l = new QHBoxLayout;
> @@ -352,7 +357,8 @@ void PrefsDialog::reset()
> {
> config_ResetAll( p_intf );
> config_SaveConfigFile( p_intf, NULL );
> - /* FIXME reset the panels */
> - destroyPanels();
> +
> + instance = NULL;
> + close();
> }
> }
> diff --git a/modules/gui/qt4/dialogs/preferences.hpp
> b/modules/gui/qt4/dialogs/preferences.hpp
> index 5125bfa..634df78 100644
> --- a/modules/gui/qt4/dialogs/preferences.hpp
> +++ b/modules/gui/qt4/dialogs/preferences.hpp
> @@ -91,7 +91,6 @@ private slots:
> void save();
> void cancel();
> void reset();
> - void close(){ save(); }; /* Needed for any generic CloseEvent*/
> };
>
> #endif
>
>
>
> ------------------------------
>
> Message: 8
> Date: Mon, 28 Jul 2008 09:19:03 +0200 (CEST)
> From: git at videolan.org (git version control)
> Subject: [vlc-devel] commit: We even can show a new dialog after reset
> the preferences. ( Jean-Baptiste Kempf )
> To: <vlc-devel at videolan.org>
> Message-ID: <20080728071903.148C320927 at skanda.videolan.org>
> Content-Type: text/plain; charset=UTF-8
>
> vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jul 28
> 00:22:06 2008 -0700| [67cc17320f06fb7e18e676154e1b1583be1a7613]
>
> We even can show a new dialog after reset the preferences.
> Complete fix of #1777.
>
> >
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=67cc17320f06fb7e18e676154e1b1583be1a7613
> ---
>
> modules/gui/qt4/dialogs/preferences.cpp | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/modules/gui/qt4/dialogs/preferences.cpp
> b/modules/gui/qt4/dialogs/preferences.cpp
> index a841f70..142c358 100644
> --- a/modules/gui/qt4/dialogs/preferences.cpp
> +++ b/modules/gui/qt4/dialogs/preferences.cpp
> @@ -360,5 +360,6 @@ void PrefsDialog::reset()
>
> instance = NULL;
> close();
> + PrefsDialog::getInstance( p_intf )->show();
> }
> }
>
>
>
> ------------------------------
>
> Message: 9
> Date: Mon, 28 Jul 2008 09:50:38 +0200 (CEST)
> From: git at videolan.org (git version control)
> Subject: [vlc-devel] commit: upnp_intel: Fix playlist locking. ( R?mi
> Duraffort )
> To: <vlc-devel at videolan.org>
> Message-ID: <20080728075038.82AAE20F8F at skanda.videolan.org>
> Content-Type: text/plain; charset=UTF-8
>
> vlc | branch: master | R?mi Duraffort <ivoire at videolan.org> | Mon Jul 28
> 09:53:01 2008 +0200| [90a6e08532db5733843224cf0d327f36d0400f73]
>
> upnp_intel: Fix playlist locking.
>
> >
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=90a6e08532db5733843224cf0d327f36d0400f73
> ---
>
> modules/services_discovery/upnp_intel.cpp | 13 ++++++++++---
> 1 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/modules/services_discovery/upnp_intel.cpp
> b/modules/services_discovery/upnp_intel.cpp
> index df4807a..911d3cf 100644
> --- a/modules/services_discovery/upnp_intel.cpp
> +++ b/modules/services_discovery/upnp_intel.cpp
> @@ -309,10 +309,12 @@ static void Close( vlc_object_t *p_this )
> services_discovery_t *p_sd = ( services_discovery_t* )p_this;
> services_discovery_sys_t *p_sys = p_sd->p_sys;
>
> + vlc_object_lock( p_sys->p_playlist );
> playlist_NodeDelete( pl_Get( p_sd ), p_sys->p_node_one, true,
> true );
> playlist_NodeDelete( pl_Get( p_sd ), p_sys->p_node_cat, true,
> true );
> + vlc_object_unlock( p_sys->p_playlist );
> pl_Release( p_sd );
> free( p_sys );
> }
> @@ -629,8 +631,10 @@ MediaServer::~MediaServer()
> {
> if ( _contents )
> {
> + vlc_object_lock( _cookie->serviceDiscovery->p_sys->p_playlist );
> playlist_NodeDelete( pl_Get( _cookie->serviceDiscovery ) ,
> _playlistNode, true, true );
> + vlc_object_unlock( _cookie->serviceDiscovery->p_sys->p_playlist );
> }
>
> delete _contents;
> @@ -927,9 +931,12 @@ bool MediaServerList::addServer( MediaServer* s )
> _list.push_back( s );
>
> char* name = strdup( s->getFriendlyName() );
> - playlist_item_t* node = playlist_NodeCreate( pl_Get(
> _cookie->serviceDiscovery ),
> - name,
> -
> _cookie->serviceDiscovery->p_sys->p_node_cat, 0, NULL );
> + vlc_object_lock( _cookie->serviceDiscovery->p_sys->p_playlist );
> + playlist_item_t* node = playlist_NodeCreate(
> + pl_Get( _cookie->serviceDiscovery ), name,
> +
> _cookie->serviceDiscovery->p_sys->p_node_cat,
> + 0, NULL );
> + vlc_object_unlock( _cookie->serviceDiscovery->p_sys->p_playlist );
> free( name );
> s->setPlaylistNode( node );
>
>
>
>
> ------------------------------
>
> _______________________________________________
> vlc-devel mailing list
> vlc-devel at videolan.org
> http://mailman.videolan.org/listinfo/vlc-devel
>
>
> End of vlc-devel Digest, Vol 14, Issue 157
> ******************************************
>
--
Moussa Kandalaf
Estudiante Ing. Civil Informática
UTFSM
09-76233842
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20080728/815f2686/attachment.html>
More information about the vlc-devel
mailing list