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