[vlc-commits] Support qcp file opening

2012-03-01 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Fri Mar  2 
02:23:41 2012 +0100| [b6f678aa0fabb3e240f54457271c69c44e8ce0bd] | committer: 
Jean-Baptiste Kempf

Support qcp file opening

Close #6291

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b6f678aa0fabb3e240f54457271c69c44e8ce0bd
---

 extras/package/win32/vlc.win32.nsi.in |1 +
 include/vlc_interface.h   |3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/extras/package/win32/vlc.win32.nsi.in 
b/extras/package/win32/vlc.win32.nsi.in
index f9e32bd..0b85444 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -288,6 +288,7 @@ FunctionEnd
   !insertmacro ${_action} ".mpc"
   !insertmacro ${_action} ".oma"
   !insertmacro ${_action} ".oga"
+  !insertmacro ${_action} ".qcp"
   !insertmacro ${_action} ".rmi"
   !insertmacro ${_action} ".snd"
   !insertmacro ${_action} ".s3m"
diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 7023e87..e1267b0 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -167,7 +167,7 @@ typedef enum vlc_dialog {
 
 #define EXTENSIONS_AUDIO_CSV "3ga", "a52", "aac", "ac3", "ape", "awb", "dts", 
"flac", "it", \
  "m4a", "m4p", "mka", "mlp", "mod", "mp1", "mp2", 
"mp3",\
- "oga", "ogg", "oma", "s3m", "spx", "thd", "tta", \
+ "oga", "ogg", "oma", "qcp", "rmi", "s3m", "spx", 
"thd", "tta", \
  "wav", "wma", "wv", "xm"
 
 #define EXTENSIONS_VIDEO_CSV "asf", "avi", "divx", "drc", "dv", "f4v", "flv", 
"gxf", "iso", \
@@ -209,6 +209,7 @@ typedef enum vlc_dialog {
 "*.oga;" \
 "*.ogg;" \
 "*.oma;" \
+"*.qcp;" \
 "*.rmi;" \
 "*.s3m;" \
 "*.spx;" \

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: preferences_widgets: fix vtable entries for show()/hide()

2012-03-01 Thread Francois Cartegnie 
vlc/vlc-2.0 | branch: master | Francois Cartegnie  | Fri Mar  
2 01:28:41 2012 +0100| [6fd13981389405c724be39111e50e639eb612a3e] | committer: 
Jean-Baptiste Kempf

Qt: preferences_widgets: fix vtable entries for show()/hide()
(cherry picked from commit d73cc541acbf2ba3067ea76aaedf61b7742a01a0)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=6fd13981389405c724be39111e50e639eb612a3e
---

 modules/gui/qt4/components/preferences_widgets.hpp |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp 
b/modules/gui/qt4/components/preferences_widgets.hpp
index f7d7e36..485210a 100644
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -139,8 +139,8 @@ public:
 IntegerConfigControl( vlc_object_t *, module_config_t *,
   QLabel*, QSlider* );
 virtual int getValue() const;
-virtual void show() const { spin->show(); if( label ) label->show(); }
-virtual void hide() const { spin->hide(); if( label ) label->hide(); }
+virtual void show() { spin->show(); if( label ) label->show(); }
+virtual void hide() { spin->hide(); if( label ) label->hide(); }
 
 protected:
 QSpinBox *spin;

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: fix navigation menu rebuilding

2012-03-01 Thread Jean-Baptiste Kempf 
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf  | Tue 
Feb 28 03:37:42 2012 +0100| [e64fdefd73d4bfb53bfc5da9537e4b12fc2edfa0] | 
committer: Jean-Baptiste Kempf

Qt: fix navigation menu rebuilding

Close #6219
(cherry picked from commit fd7e3ccc211703d018d454625a37a1ca662b7b15)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=e64fdefd73d4bfb53bfc5da9537e4b12fc2edfa0
---

 modules/gui/qt4/menus.cpp |   21 -
 modules/gui/qt4/menus.hpp |3 ++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 2a5d09a..b120d4d 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -707,7 +707,6 @@ QMenu *VLCMenuBar::NavigMenu( intf_thread_t *p_intf, QMenu 
*menu )
 
 QMenu *VLCMenuBar::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu, bool 
b_keep )
 {
-
 /* */
 input_thread_t *p_object;
 QVector objects;
@@ -724,20 +723,22 @@ QMenu *VLCMenuBar::RebuildNavigMenu( intf_thread_t 
*p_intf, QMenu *menu, bool b_
 PUSH_VAR( "prev-chapter" );
 PUSH_VAR( "next-chapter" );
 
+/* */
+EnableStaticEntries( menu, (p_object != NULL ) );
+Populate( p_intf, menu, varnames, objects );
+
 /* Remove playback actions to recreate them */
 if( !b_keep )
 {
 QList< QAction* > actions = menu->actions();
-if( actions.count() > 4 )
-for( int i = actions.count() - 1 ; i >= actions.count() - 1 - 4 ; 
--i )
+for( int i = 0; i < actions.count(); i++ )
+if( actions[i]->data().toInt() & ACTION_DELETE_ON_REBUILD )
 delete actions[i];
 }
 
 PopupMenuPlaylistEntries( menu, p_intf, p_object );
 
-/* */
-EnableStaticEntries( menu, (p_object != NULL ) );
-return Populate( p_intf, menu, varnames, objects );
+return menu;
 }
 
 /**
@@ -792,28 +793,30 @@ void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu,
 }
 else
 {
-addMIMStaticEntry( p_intf, menu, qtr( "Pause" ),
+action = addMIMStaticEntry( p_intf, menu, qtr( "Pause" ),
 ":/menu/pause", SLOT( togglePlayPause() ) );
 }
+action->setData( ACTION_DELETE_ON_REBUILD );
 
 /* Stop */
 action = addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ),
 ":/menu/stop", SLOT( stop() ), true );
 if( !p_input )
 action->setEnabled( false );
+action->setData( ACTION_DELETE_ON_REBUILD );
 
 /* Next / Previous */
 bool bPlaylistEmpty = THEMIM->hasEmptyPlaylist();
 action = addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ),
 ":/menu/previous", SLOT( prev() ), true );
 action->setEnabled( !bPlaylistEmpty );
-action->setData( ACTION_NO_CLEANUP );
+action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
 CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
 
 action = addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ),
 ":/menu/next", SLOT( next() ), true );
 action->setEnabled( !bPlaylistEmpty );
-action->setData( ACTION_NO_CLEANUP );
+action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD );
 CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
 
 menu->addSeparator();
diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index b880985..3ccee3b 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -94,7 +94,8 @@ public:
 ACTION_ALWAYS_ENABLED = 0x1,
 ACTION_MANAGED = 0x2, /* managed using EnableStatic(bool)? */
 ACTION_NO_CLEANUP = 0x4,
-ACTION_STATIC = 0x6 /* legacy shortcut */
+ACTION_STATIC = 0x6, /* legacy shortcut */
+ACTION_DELETE_ON_REBUILD = 0x8
 };
 Q_DECLARE_FLAGS(actionflags, actionflag)
 

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: menu simplification

2012-03-01 Thread Jean-Baptiste Kempf 
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf  | Tue 
Feb 28 02:24:12 2012 +0100| [f18ce8cb40a507d86efd7751077e1d2cd4f5] | 
committer: Jean-Baptiste Kempf

Qt: menu simplification
(cherry picked from commit 3f5029f86312e70edb86252dabcaae3ba6a71cc5)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=f18ce8cb40a507d86efd7751077e1d2cd4f5
---

 modules/gui/qt4/menus.cpp |   67 +++-
 modules/gui/qt4/menus.hpp |6 ++--
 2 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 33217a5..2a5d09a 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -733,8 +733,7 @@ QMenu *VLCMenuBar::RebuildNavigMenu( intf_thread_t *p_intf, 
QMenu *menu, bool b_
 delete actions[i];
 }
 
-PopupPlayEntries( menu, p_intf, p_object );
-PopupMenuPlaylistControlEntries( menu, p_intf );
+PopupMenuPlaylistEntries( menu, p_intf, p_object );
 
 /* */
 EnableStaticEntries( menu, (p_object != NULL ) );
@@ -776,7 +775,7 @@ QMenu *VLCMenuBar::HelpMenu( QWidget *parent )
 Populate( p_intf, menu, varnames, objects ); \
 menu->popup( QCursor::pos() ); \
 
-void VLCMenuBar::PopupPlayEntries( QMenu *menu,
+void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu,
 intf_thread_t *p_intf,
 input_thread_t *p_input )
 {
@@ -793,9 +792,31 @@ void VLCMenuBar::PopupPlayEntries( QMenu *menu,
 }
 else
 {
- addMIMStaticEntry( p_intf, menu, qtr( "Pause" ),
-":/menu/pause", SLOT( togglePlayPause() ) );
+addMIMStaticEntry( p_intf, menu, qtr( "Pause" ),
+":/menu/pause", SLOT( togglePlayPause() ) );
 }
+
+/* Stop */
+action = addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ),
+":/menu/stop", SLOT( stop() ), true );
+if( !p_input )
+action->setEnabled( false );
+
+/* Next / Previous */
+bool bPlaylistEmpty = THEMIM->hasEmptyPlaylist();
+action = addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ),
+":/menu/previous", SLOT( prev() ), true );
+action->setEnabled( !bPlaylistEmpty );
+action->setData( ACTION_NO_CLEANUP );
+CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
+
+action = addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ),
+":/menu/next", SLOT( next() ), true );
+action->setEnabled( !bPlaylistEmpty );
+action->setData( ACTION_NO_CLEANUP );
+CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
+
+menu->addSeparator();
 }
 
 void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
@@ -863,33 +884,6 @@ void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, 
intf_thread_t *p_intf,
 menu->addSeparator();
 }
 
-void VLCMenuBar::PopupMenuPlaylistControlEntries( QMenu *menu,
-intf_thread_t *p_intf )
-{
-bool bEnable = THEMIM->getInput() != NULL;
-bool bPlaylistEmpty = THEMIM->hasEmptyPlaylist();
-QAction *action = addMIMStaticEntry( p_intf, menu, qtr( "&Stop" ),
- ":/menu/stop", SLOT( stop() ), true );
-/* Disable Stop in the right-click popup menu */
-if( !bEnable )
-action->setEnabled( false );
-
-/* Next / Previous */
-action = addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ),
-":/menu/previous", SLOT( prev() ), true );
-action->setEnabled( !bPlaylistEmpty );
-action->setData( ACTION_NO_CLEANUP );
-CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
-
-action = addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ),
-":/menu/next", SLOT( next() ), true );
-action->setEnabled( !bPlaylistEmpty );
-action->setData( ACTION_NO_CLEANUP );
-CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) );
-
-menu->addSeparator();
-}
-
 void VLCMenuBar::PopupMenuStaticEntries( QMenu *menu )
 {
 QMenu *openmenu = new QMenu( qtr( "Open Media" ), menu );
@@ -962,8 +956,7 @@ void VLCMenuBar::MiscPopupMenu( intf_thread_t *p_intf, bool 
show )
 Populate( p_intf, menu, varnames, objects );
 
 menu->addSeparator();
-PopupPlayEntries( menu, p_intf, p_input );
-PopupMenuPlaylistControlEntries( menu, p_intf);
+PopupMenuPlaylistEntries( menu, p_intf, p_input );
 
 menu->addSeparator();
 PopupMenuControlEntries( menu, p_intf );
@@ -985,8 +978,7 @@ void VLCMenuBar::PopupMenu( intf_thread_t *p_intf, bool 
show )
 bool b_isFullscreen = false;
 MainInterface *mi = p_intf->p_sys->p_mi;
 
-PopupPlayEntries( menu, p_intf, p_input );
-PopupMenuPlaylistControlEntries( menu, p_intf );
+PopupMenuPlaylistEntries( menu, p_intf, p_input );
 menu->addSeparator();
 
 if( p_input )
@@ -1130,8 +1122,7 @@ void VLCMenuBar::up

[vlc-commits] Qt: qmenuview: fix macro usage

2012-03-01 Thread Francois Cartegnie 
vlc/vlc-2.0 | branch: master | Francois Cartegnie  | Fri Mar  
2 00:50:50 2012 +0100| [401563f8391b946ec46597be8ba207fe1cc1daf4] | committer: 
Jean-Baptiste Kempf

Qt: qmenuview: fix macro usage
(cherry picked from commit 2d2c0ffaa99f2146c643e50aa1c82fdaa8a7adad)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=401563f8391b946ec46597be8ba207fe1cc1daf4
---

 modules/gui/qt4/util/qmenuview.hpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/util/qmenuview.hpp 
b/modules/gui/qt4/util/qmenuview.hpp
index d63be2c..76330cc 100644
--- a/modules/gui/qt4/util/qmenuview.hpp
+++ b/modules/gui/qt4/util/qmenuview.hpp
@@ -29,7 +29,7 @@
 
 class QMenuView : public QMenu
 {
-Q_OBJECT;
+Q_OBJECT
 
 public:
 QMenuView( QWidget * parent = 0, int iMaxVisibleCount = 0 );

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Work around automake bug (?) to distribute contribs

2012-03-01 Thread Rémi Denis-Courmont 
vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont  | Thu Mar  
1 19:06:20 2012 +0200| [47ec4cecd6ccb68cf358d5bf54143a23ab55a2ff] | committer: 
Jean-Baptiste Kempf

Work around automake bug (?) to distribute contribs

Files were copied to contrib/src/src instead of contrib/src...
(cherry picked from commit 49399c2720db101476aed2014c58444929357e19)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=47ec4cecd6ccb68cf358d5bf54143a23ab55a2ff
---

 Makefile.am |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index aa149fa..858d2f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -381,7 +381,7 @@ EXTRA_DIST += \
 ##
 EXTRA_DIST += \
contrib/bootstrap \
-   contrib/src/
+   contrib/src
 
 ###
 # Building libvlc

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: remove unneeded includes

2012-03-01 Thread Jean-Baptiste Kempf 
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf  | Tue 
Feb 28 01:13:09 2012 +0100| [f61ba3e23bbf4836af78c8d9d791094b64093274] | 
committer: Jean-Baptiste Kempf

Qt: remove unneeded includes
(cherry picked from commit e837f1cf0577a960450b2955809cc458ab164d20)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=f61ba3e23bbf4836af78c8d9d791094b64093274
---

 modules/gui/qt4/menus.cpp |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 0ebf6f8..33217a5 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -55,9 +55,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 
 /*
   This file defines the main menus and the pop-up menu (right-click menu)

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Remove unused PLUGINS variable

2012-03-01 Thread Rafaël Carré 
vlc/vlc-2.0 | branch: master | Rafaël Carré  | Wed Feb 29 
17:32:16 2012 -0500| [ab5a8007a2d802a5c1d31f7af396ae3e8ded2bf7] | committer: 
Jean-Baptiste Kempf

Remove unused PLUGINS variable
(cherry picked from commit 91df5145e02822572c0fcc8f341b371c34817890)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=ab5a8007a2d802a5c1d31f7af396ae3e8ded2bf7
---

 configure.ac |5 -
 m4/vlc.m4|1 -
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7e4a73f..a4296e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4195,11 +4195,6 @@ dnl
 VLC_RESTORE_FLAGS
 
 dnl
-dnl Sort the modules list
-dnl
-PLUGINS=$( (for i in `echo $PLUGINS`; do echo $i; done)|sort|xargs )
-
-dnl
 dnl  Configuration is finished
 dnl
 AC_SUBST(SYS)
diff --git a/m4/vlc.m4 b/m4/vlc.m4
index ee5f8b7..1adec40 100644
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -7,7 +7,6 @@ m4_pattern_allow([^PKG_CONFIG(_LIBDIR)?$])
 
 AC_DEFUN([VLC_ADD_PLUGIN], [
   m4_foreach_w([element], [$1], [
-[PLUGINS="${PLUGINS} ]element["]
 AC_SUBST([LTLIB]element, [lib]element[_plugin.la])
   ])
 ])

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: qmenuview: fix macro usage

2012-03-01 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Fri Mar  2 
00:50:50 2012 +0100| [2d2c0ffaa99f2146c643e50aa1c82fdaa8a7adad] | committer: 
Francois Cartegnie

Qt: qmenuview: fix macro usage

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2d2c0ffaa99f2146c643e50aa1c82fdaa8a7adad
---

 modules/gui/qt4/util/qmenuview.hpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/util/qmenuview.hpp 
b/modules/gui/qt4/util/qmenuview.hpp
index d63be2c..76330cc 100644
--- a/modules/gui/qt4/util/qmenuview.hpp
+++ b/modules/gui/qt4/util/qmenuview.hpp
@@ -29,7 +29,7 @@
 
 class QMenuView : public QMenu
 {
-Q_OBJECT;
+Q_OBJECT
 
 public:
 QMenuView( QWidget * parent = 0, int iMaxVisibleCount = 0 );

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: playlist_model: don't declare array with non constant expression

2012-03-01 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Fri Mar  2 
01:01:29 2012 +0100| [e4a2f9949332e0336dca030b01662503b402c8fe] | committer: 
Francois Cartegnie

Qt: playlist_model: don't declare array with non constant expression

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e4a2f9949332e0336dca030b01662503b402c8fe
---

 .../gui/qt4/components/playlist/playlist_model.cpp |   18 ++
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp 
b/modules/gui/qt4/components/playlist/playlist_model.cpp
index f17e7e3..63aa259 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -233,7 +233,10 @@ void PLModel::dropMove( const PlMimeData * plMimeData, 
PLItem *target, int row )
 {
 QList inputItems = plMimeData->inputItems();
 QList model_items;
-playlist_item_t *pp_items[inputItems.count()];
+playlist_item_t **pp_items;
+pp_items = (playlist_item_t **)
+   calloc( inputItems.count(), sizeof( playlist_item_t* ) );
+if ( !pp_items ) return;
 
 PL_LOCK;
 
@@ -242,7 +245,9 @@ void PLModel::dropMove( const PlMimeData * plMimeData, 
PLItem *target, int row )
 
 if( !p_parent || row > p_parent->i_children )
 {
-PL_UNLOCK; return;
+PL_UNLOCK;
+free( pp_items );
+return;
 }
 
 int new_pos = row == -1 ? p_parent->i_children : row;
@@ -265,7 +270,9 @@ void PLModel::dropMove( const PlMimeData * plMimeData, 
PLItem *target, int row )
 {
 if( climber == item )
 {
-PL_UNLOCK; return;
+PL_UNLOCK;
+free( pp_items );
+return;
 }
 climber = climber->parent();
 }
@@ -281,7 +288,9 @@ void PLModel::dropMove( const PlMimeData * plMimeData, 
PLItem *target, int row )
 
 if( model_items.isEmpty() )
 {
-PL_UNLOCK; return;
+PL_UNLOCK;
+free( pp_items );
+return;
 }
 
 playlist_TreeMoveMany( p_playlist, i, pp_items, p_parent, new_pos );
@@ -292,6 +301,7 @@ void PLModel::dropMove( const PlMimeData * plMimeData, 
PLItem *target, int row )
 takeItem( item );
 
 insertChildren( target, model_items, model_pos );
+free( pp_items );
 }
 
 /* remove item with its id */

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: preferences_widgets: fix vtable entries for show()/hide()

2012-03-01 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Fri Mar  2 
01:28:41 2012 +0100| [d73cc541acbf2ba3067ea76aaedf61b7742a01a0] | committer: 
Francois Cartegnie

Qt: preferences_widgets: fix vtable entries for show()/hide()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d73cc541acbf2ba3067ea76aaedf61b7742a01a0
---

 modules/gui/qt4/components/preferences_widgets.hpp |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.hpp 
b/modules/gui/qt4/components/preferences_widgets.hpp
index 20d2529..78686f8 100644
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -139,8 +139,8 @@ public:
 IntegerConfigControl( vlc_object_t *, module_config_t *,
   QLabel*, QSlider* );
 virtual int getValue() const;
-virtual void show() const { spin->show(); if( label ) label->show(); }
-virtual void hide() const { spin->hide(); if( label ) label->hide(); }
+virtual void show() { spin->show(); if( label ) label->show(); }
+virtual void hide() { spin->hide(); if( label ) label->hide(); }
 
 protected:
 QSpinBox *spin;

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vlc_keys: define mouse's middle, 4 & 5 buttons.

2012-03-01 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Fri Feb 24 
19:24:52 2012 +0100| [aeb250f758bfce98368ccb094067a8ad82bea7c6] | committer: 
Francois Cartegnie

vlc_keys: define mouse's middle, 4 & 5 buttons.

The same way as Wheel left/right, allow to use
those buttons for GUI shortcuts.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aeb250f758bfce98368ccb094067a8ad82bea7c6
---

 include/vlc_keys.h   |4 
 include/vlc_mouse.h  |2 ++
 src/config/keys.c|3 +++
 src/video_output/event.h |5 -
 4 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index f08243b..0c23672 100644
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -81,6 +81,10 @@
 #define KEY_MEDIA_STOP   0x004B
 #define KEY_MEDIA_PLAY_PAUSE 0x004C
 
+#define KEY_MOUSEBUTTON_MID  0x00ED
+#define KEY_MOUSEBUTTON_X1   0x00EE
+#define KEY_MOUSEBUTTON_X2   0x00EF
+
 #define KEY_MOUSEWHEELUP 0x00F0
 #define KEY_MOUSEWHEELDOWN   0x00F1
 #define KEY_MOUSEWHEELLEFT   0x00F2
diff --git a/include/vlc_mouse.h b/include/vlc_mouse.h
index b488535..8565e5a 100644
--- a/include/vlc_mouse.h
+++ b/include/vlc_mouse.h
@@ -36,6 +36,8 @@ enum
 MOUSE_BUTTON_WHEEL_DOWN,
 MOUSE_BUTTON_WHEEL_LEFT,
 MOUSE_BUTTON_WHEEL_RIGHT,
+MOUSE_BUTTON_X1,
+MOUSE_BUTTON_X2,
 MOUSE_BUTTON_MAX
 };
 
diff --git a/src/config/keys.c b/src/config/keys.c
index b833e02..62616a8 100644
--- a/src/config/keys.c
+++ b/src/config/keys.c
@@ -85,6 +85,9 @@ static const struct key_descriptor_s vlc_keys[] =
 { "Media Prev Track",  KEY_MEDIA_PREV_TRACK  },
 { "Media Stop",KEY_MEDIA_STOP},
 { "Menu",  KEY_MENU  },
+{ "Mouse Button Mid",  KEY_MOUSEBUTTON_MID   },
+{ "Mouse Button X1",   KEY_MOUSEBUTTON_X1},
+{ "Mouse Button X2",   KEY_MOUSEBUTTON_X2},
 { "Mouse Wheel Down",  KEY_MOUSEWHEELDOWN},
 { "Mouse Wheel Left",  KEY_MOUSEWHEELLEFT},
 { "Mouse Wheel Right", KEY_MOUSEWHEELRIGHT   },
diff --git a/src/video_output/event.h b/src/video_output/event.h
index 38c7be4..bcd3835 100644
--- a/src/video_output/event.h
+++ b/src/video_output/event.h
@@ -72,7 +72,8 @@ static inline void vout_SendEventMousePressed(vout_thread_t 
*vout, int button)
 }
 case MOUSE_BUTTON_CENTER:
 var_ToggleBool(vout->p_libvlc, "intf-toggle-fscontrol");
-return;
+key = KEY_MOUSEBUTTON_MID;
+break;
 case MOUSE_BUTTON_RIGHT:
 var_SetBool(vout->p_libvlc, "intf-popupmenu", true);
 return;
@@ -80,6 +81,8 @@ static inline void vout_SendEventMousePressed(vout_thread_t 
*vout, int button)
 case MOUSE_BUTTON_WHEEL_DOWN:  key = KEY_MOUSEWHEELDOWN;  break;
 case MOUSE_BUTTON_WHEEL_LEFT:  key = KEY_MOUSEWHEELLEFT;  break;
 case MOUSE_BUTTON_WHEEL_RIGHT: key = KEY_MOUSEWHEELRIGHT; break;
+case MOUSE_BUTTON_X1:  key = KEY_MOUSEBUTTON_X1; break;
+case MOUSE_BUTTON_X2:  key = KEY_MOUSEBUTTON_X2; break;
 }
 vout_SendEventKey(vout, key);
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: handle special mouse buttons

2012-03-01 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Mon Feb 27 
20:54:31 2012 +0100| [e3511f67bc3ea374382359ed92b6d4312282f7a9] | committer: 
Francois Cartegnie

Qt: handle special mouse buttons

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e3511f67bc3ea374382359ed92b6d4312282f7a9
---

 modules/gui/qt4/components/preferences_widgets.cpp |8 
 modules/gui/qt4/components/preferences_widgets.hpp |1 +
 modules/gui/qt4/main_interface.cpp |   12 
 modules/gui/qt4/main_interface.hpp |1 +
 modules/gui/qt4/util/customwidgets.cpp |   20 
 modules/gui/qt4/util/customwidgets.hpp |1 +
 6 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp 
b/modules/gui/qt4/components/preferences_widgets.cpp
index 59bda1a..6eb66d4 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -1614,3 +1614,11 @@ void KeyInputDialog::wheelEvent( QWheelEvent *e )
 keyValue = i_vlck;
 }
 
+void KeyInputDialog::mousePressEvent( QMouseEvent *e )
+{
+int i_vlck = qtMouseEventToVLCKey( e );
+selected->setText( qtr( "Key: " ) + VLCKeyToString( i_vlck ) );
+checkForConflicts( i_vlck );
+keyValue = i_vlck;
+}
+
diff --git a/modules/gui/qt4/components/preferences_widgets.hpp 
b/modules/gui/qt4/components/preferences_widgets.hpp
index f7d7e36..20d2529 100644
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -485,6 +485,7 @@ private:
 void checkForConflicts( int i_vlckey );
 void keyPressEvent( QKeyEvent *);
 void wheelEvent( QWheelEvent *);
+void mousePressEvent( QMouseEvent * );
 bool b_global;
 };
 #endif
diff --git a/modules/gui/qt4/main_interface.cpp 
b/modules/gui/qt4/main_interface.cpp
index 091a99b..e0a8562 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -1314,6 +1314,18 @@ void MainInterface::wheelEvent( QWheelEvent *e )
 e->accept();
 }
 
+void MainInterface::mousePressEvent( QMouseEvent *e )
+{
+int i_vlckey = qtMouseEventToVLCKey( e );
+if( i_vlckey > 0 )
+{
+var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlckey );
+e->accept();
+}
+else
+e->ignore();
+}
+
 void MainInterface::closeEvent( QCloseEvent *e )
 {
 //  hide();
diff --git a/modules/gui/qt4/main_interface.hpp 
b/modules/gui/qt4/main_interface.hpp
index 3567c4a..39c0de5 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -101,6 +101,7 @@ protected:
 virtual void closeEvent( QCloseEvent *);
 virtual void keyPressEvent( QKeyEvent *);
 virtual void wheelEvent( QWheelEvent * );
+virtual void mousePressEvent( QMouseEvent * );
 
 private:
 /* Main Widgets Creation */
diff --git a/modules/gui/qt4/util/customwidgets.cpp 
b/modules/gui/qt4/util/customwidgets.cpp
index 16c6563..fce8555 100644
--- a/modules/gui/qt4/util/customwidgets.cpp
+++ b/modules/gui/qt4/util/customwidgets.cpp
@@ -286,6 +286,26 @@ int qtWheelEventToVLCKey( QWheelEvent *e )
 return i_vlck;
 }
 
+int qtMouseEventToVLCKey( QMouseEvent *e )
+{
+int i_vlck = 0;
+switch( e->button() )
+{
+case Qt::MidButton:
+i_vlck |= KEY_MOUSEBUTTON_MID;
+break;
+case Qt::XButton1:
+i_vlck |= KEY_MOUSEBUTTON_X1;
+break;
+case Qt::XButton2:
+i_vlck |= KEY_MOUSEBUTTON_X2;
+default:
+break;
+}
+if ( i_vlck > 0 ) i_vlck |= qtKeyModifiersToVLC( e );
+return i_vlck;
+}
+
 QString VLCKeyToString( unsigned val )
 {
 char *base = vlc_keycode2str (val);
diff --git a/modules/gui/qt4/util/customwidgets.hpp 
b/modules/gui/qt4/util/customwidgets.hpp
index 8f8fb3e..ac0d5fc 100644
--- a/modules/gui/qt4/util/customwidgets.hpp
+++ b/modules/gui/qt4/util/customwidgets.hpp
@@ -179,6 +179,7 @@ class QInputEvent;
 int qtKeyModifiersToVLC( QInputEvent* e );
 int qtEventToVLCKey( QKeyEvent *e );
 int qtWheelEventToVLCKey( QWheelEvent *e );
+int qtMouseEventToVLCKey( QMouseEvent *e );
 QString VLCKeyToString( unsigned val );
 
 #endif

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: Don't bypass (goto error) local variable declarations

2012-03-01 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Fri Mar  2 
00:46:28 2012 +0100| [0bb2110cebcae124ccf503de9e4863b6a8cc0982] | committer: 
Francois Cartegnie

Qt: Don't bypass (goto error) local variable declarations

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0bb2110cebcae124ccf503de9e4863b6a8cc0982
---

 modules/gui/qt4/qt4.cpp |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 64d75a0..73e84d5 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -183,6 +183,12 @@ static void ShowDialog   ( intf_thread_t *, int, int, 
intf_dialog_args_t * );
 #define ICONCHANGE_LONGTEXT N_( \
 "This option allows the interface to change its icon on various 
occasions.")
 
+static const int i_notification_list[] =
+{ NOTIFICATION_NEVER, NOTIFICATION_MINIMIZED, NOTIFICATION_ALWAYS };
+
+static const char *const psz_notification_list_text[] =
+{ N_("Never"), N_("When minimized"), N_("Always") };
+
 /**/
 vlc_module_begin ()
 set_shortname( "Qt" )
@@ -205,12 +211,6 @@ vlc_module_begin ()
 #endif
 SYSTRAY_TEXT, SYSTRAY_LONGTEXT, false)
 
-static const int i_notification_list[] =
-{ NOTIFICATION_NEVER, NOTIFICATION_MINIMIZED, NOTIFICATION_ALWAYS };
-
-static const char *const psz_notification_list_text[] =
-{ N_("Never"), N_("When minimized"), N_("Always") };
-
 add_integer( "qt-notification", NOTIFICATION_MINIMIZED,
  NOTIFICATION_TEXT,
  NOTIFICATION_LONGTEXT, false )

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Add Keywords to the vlc.desktop file

2012-03-01 Thread Jean-Baptiste Kempf 
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf  | Thu 
Mar  1 10:40:46 2012 +0100| [5b7c3385a32f6c56062eda9c8bbad4dccc5ab0ca] | 
committer: Jean-Baptiste Kempf

Add Keywords to the vlc.desktop file

Close #6275
Close LP:943014
(cherry picked from commit 2eba8b99b7b7b5c64041d374718ce3d7ff17a0b8)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=5b7c3385a32f6c56062eda9c8bbad4dccc5ab0ca
---

 share/vlc.desktop.in |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/share/vlc.desktop.in b/share/vlc.desktop.in
index 0488db6..1631477 100644
--- a/share/vlc.desktop.in
+++ b/share/vlc.desktop.in
@@ -93,6 +93,7 @@ TryExec=@bindir@/vlc
 Icon=vlc
 Terminal=false
 Type=Application
-Categories=AudioVideo;Player;
+Categories=AudioVideo;Player;Recorder;
 
MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;video/x-flv;video/vnd.rn-realvideo;video/mp4;video/mp4v-es;video/mp2t;application/ogg;application/x-ogg;video/x-ogm+ogg;audio/x-vorbis+ogg;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm;audio/webm;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;audio/amr;audio/amr-wb;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;applic
 
ation/xspf+xml;x-scheme-handler/mms;x-scheme-handler/rtmp;x-scheme-handler/rtsp;
 X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb
+Keywords=Player;Capture;DVD;Audio;Video;Server;Broadcast;

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Revert "Link vlc-cache-gen with the C++ standard library..."

2012-03-01 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Thu Mar  1 
22:42:13 2012 +0200| [6c2f2728fee10b8be2dc289c032646851553fd5d] | committer: 
Rémi Denis-Courmont

Revert "Link vlc-cache-gen with the C++ standard library..."

This reverts commit 07d38617832be934896fa7a14fe52f1a65c901ab.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6c2f2728fee10b8be2dc289c032646851553fd5d
---

 bin/Makefile.am |2 +-
 bin/dummy.cpp   |1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 40b4f46..832d482 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -59,7 +59,7 @@ vlc_win32_rc.rc: $(top_builddir)/config.status 
vlc_win32_rc.rc.in
 vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
$(WINDRES) --include-dir $(top_srcdir)/share/icons -i $< -o $@
 
-vlc_cache_gen_SOURCES = cachegen.c dummy.cpp
+vlc_cache_gen_SOURCES = cachegen.c
 vlc_cache_gen_LDADD = \
$(GNUGETOPT_LIBS) \
../compat/libcompat.la \
diff --git a/bin/dummy.cpp b/bin/dummy.cpp
deleted file mode 100644
index 56a8b38..000
--- a/bin/dummy.cpp
+++ /dev/null
@@ -1 +0,0 @@
-/* This file is only here to force cachegen to be linked against libstdc++ */

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: don't let the video window get larger than the screen it is on ( close #5875)

2012-03-01 Thread Felix Paul Kühne 
vlc/vlc-2.0 | branch: master | Felix Paul Kühne  | Thu 
Mar  1 19:42:10 2012 +0100| [60296be1e97153dfa68cda49aeac8cebf95ffdb1] | 
committer: Felix Paul Kühne

macosx: don't let the video window get larger than the screen it is on (close 
#5875)
(cherry picked from commit 93b211422cf7fa0c7e61c355da2068e7e0e56a69)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=60296be1e97153dfa68cda49aeac8cebf95ffdb1
---

 modules/video_output/macosx.m |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 214c1a1..385b811 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -356,6 +356,7 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
 NSRect windowFrame = [o_window frame];
 NSRect glViewFrame = [sys->glView frame];
 NSSize windowMinSize = [o_window minSize];
+NSSize windowMaxSize = [o_window constrainFrameRect: windowFrame 
toScreen: [o_window screen]].size;
 
 topleftbase.x = 0;
 topleftbase.y = windowFrame.size.height;
@@ -370,6 +371,12 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
 if (i_height < windowMinSize.height)
 i_height = windowMinSize.height;
 
+/* don't make the window than its screen */
+if (i_width > windowMaxSize.width)
+i_width = windowMaxSize.width;
+if (i_height > windowMaxSize.height)
+i_height = windowMaxSize.height;
+
 if( i_height != glViewFrame.size.height || i_width != 
glViewFrame.size.width )
 {
 new_frame.size.width = windowFrame.size.width - 
glViewFrame.size.width + i_width;

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: don't let the video window get larger than the screen it is on ( close #5875)

2012-03-01 Thread Felix Paul Kühne 
vlc | branch: master | Felix Paul Kühne  | Thu Mar  1 
19:42:10 2012 +0100| [93b211422cf7fa0c7e61c355da2068e7e0e56a69] | committer: 
Felix Paul Kühne

macosx: don't let the video window get larger than the screen it is on (close 
#5875)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=93b211422cf7fa0c7e61c355da2068e7e0e56a69
---

 modules/video_output/macosx.m |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 1537325..9dac6bf 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -356,6 +356,7 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
 NSRect windowFrame = [o_window frame];
 NSRect glViewFrame = [sys->glView frame];
 NSSize windowMinSize = [o_window minSize];
+NSSize windowMaxSize = [o_window constrainFrameRect: windowFrame 
toScreen: [o_window screen]].size;
 
 topleftbase.x = 0;
 topleftbase.y = windowFrame.size.height;
@@ -370,6 +371,12 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
 if (i_height < windowMinSize.height)
 i_height = windowMinSize.height;
 
+/* don't make the window than its screen */
+if (i_width > windowMaxSize.width)
+i_width = windowMaxSize.width;
+if (i_height > windowMaxSize.height)
+i_height = windowMaxSize.height;
+
 if( i_height != glViewFrame.size.height || i_width != 
glViewFrame.size.width )
 {
 new_frame.size.width = windowFrame.size.width - 
glViewFrame.size.width + i_width;

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: don' t allow option-click on the playlist button in case a video is playing

2012-03-01 Thread Felix Paul Kühne 
vlc/vlc-2.0 | branch: master | Felix Paul Kühne  | Thu 
Mar  1 19:05:21 2012 +0100| [6f30aac6f5333ac40f3bd45f585c0eab0a3d8deb] | 
committer: Felix Paul Kühne

macosx: don't allow option-click on the playlist button in case a video is 
playing
(cherry picked from commit e6f14b002b2232794d9dfc4a2841d2ea1df2241f)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=6f30aac6f5333ac40f3bd45f585c0eab0a3d8deb
---

 modules/gui/macosx/MainWindow.m |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 326fedf..99775aa 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -590,7 +590,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (IBAction)togglePlaylist:(id)sender
 {
-if ( ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) 
&& !b_splitview_removed) || (b_nonembedded && [[VLCMain sharedInstance] 
activeVideoPlayback] && sender != nil) )
+if ( ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) 
&& !b_splitview_removed && ![[VLCMain sharedInstance] activeVideoPlayback]) || 
(b_nonembedded && [[VLCMain sharedInstance] activeVideoPlayback] && sender != 
nil) )
 {
 [self hideSplitView];
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: hide the playlist without option click when showing the video in a separate window (refs #6213)

2012-03-01 Thread Felix Paul Kühne 
vlc/vlc-2.0 | branch: master | Felix Paul Kühne  | Thu 
Mar  1 19:01:50 2012 +0100| [dbc2db4a36f99ac8bda0e5ea4323f499c29c65a6] | 
committer: Felix Paul Kühne

macosx: hide the playlist without option click when showing the video in a 
separate window (refs #6213)
(cherry picked from commit 566b0cd4405f9c9022789ce43c86ec5ee4753acf)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=dbc2db4a36f99ac8bda0e5ea4323f499c29c65a6
---

 modules/gui/macosx/MainWindow.m |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 08bd195..326fedf 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -590,7 +590,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (IBAction)togglePlaylist:(id)sender
 {
-if ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) && 
!b_splitview_removed)
+if ( ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) 
&& !b_splitview_removed) || (b_nonembedded && [[VLCMain sharedInstance] 
activeVideoPlayback] && sender != nil) )
 {
 [self hideSplitView];
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: fixed a crash

2012-03-01 Thread Felix Paul Kühne 
vlc/vlc-2.0 | branch: master | Felix Paul Kühne  | Thu 
Mar  1 19:00:16 2012 +0100| [71b8028859926d6293e1390028033e68b47b6685] | 
committer: Felix Paul Kühne

macosx: fixed a crash
(cherry picked from commit aff835014cd769596220b56248fecda8bf196f29)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=71b8028859926d6293e1390028033e68b47b6685
---

 modules/gui/macosx/coredialogs.m |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/coredialogs.m b/modules/gui/macosx/coredialogs.m
index dcda482..9bb043f 100644
--- a/modules/gui/macosx/coredialogs.m
+++ b/modules/gui/macosx/coredialogs.m
@@ -165,6 +165,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 {
 /* we work-around a Cocoa limitation here, since you cannot delay an 
execution
  * on the main thread within a single call */
+b_progress_cancelled = NO;
 if (VLCIntf)
 [self performSelector:@selector(showProgressDialog:) withObject: 
o_value afterDelay:3.00];
 }
@@ -173,7 +174,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 {
 dialog_progress_bar_t *p_dialog = [o_value pointerValue];
 
-if (!p_dialog)
+if (!p_dialog || b_progress_cancelled)
 return;
 
 if( p_dialog->title != NULL )
@@ -211,6 +212,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 
 -(void)destroyProgressPanel
 {
+b_progress_cancelled = YES;
 [o_prog_bar stopAnimation: self];
 [o_prog_win close];
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: don' t allow option-click on the playlist button in case a video is playing

2012-03-01 Thread Felix Paul Kühne 
vlc | branch: master | Felix Paul Kühne  | Thu Mar  1 
19:05:21 2012 +0100| [e6f14b002b2232794d9dfc4a2841d2ea1df2241f] | committer: 
Felix Paul Kühne

macosx: don't allow option-click on the playlist button in case a video is 
playing

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e6f14b002b2232794d9dfc4a2841d2ea1df2241f
---

 modules/gui/macosx/MainWindow.m |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index c721725..8a1d989 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -590,7 +590,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (IBAction)togglePlaylist:(id)sender
 {
-if ( ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) 
&& !b_splitview_removed) || (b_nonembedded && [[VLCMain sharedInstance] 
activeVideoPlayback] && sender != nil) )
+if ( ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) 
&& !b_splitview_removed && ![[VLCMain sharedInstance] activeVideoPlayback]) || 
(b_nonembedded && [[VLCMain sharedInstance] activeVideoPlayback] && sender != 
nil) )
 {
 [self hideSplitView];
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: fixed a crash

2012-03-01 Thread Felix Paul Kühne 
vlc | branch: master | Felix Paul Kühne  | Thu Mar  1 
19:00:16 2012 +0100| [aff835014cd769596220b56248fecda8bf196f29] | committer: 
Felix Paul Kühne

macosx: fixed a crash

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aff835014cd769596220b56248fecda8bf196f29
---

 modules/gui/macosx/coredialogs.m |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/coredialogs.m b/modules/gui/macosx/coredialogs.m
index dcda482..9bb043f 100644
--- a/modules/gui/macosx/coredialogs.m
+++ b/modules/gui/macosx/coredialogs.m
@@ -165,6 +165,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 {
 /* we work-around a Cocoa limitation here, since you cannot delay an 
execution
  * on the main thread within a single call */
+b_progress_cancelled = NO;
 if (VLCIntf)
 [self performSelector:@selector(showProgressDialog:) withObject: 
o_value afterDelay:3.00];
 }
@@ -173,7 +174,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 {
 dialog_progress_bar_t *p_dialog = [o_value pointerValue];
 
-if (!p_dialog)
+if (!p_dialog || b_progress_cancelled)
 return;
 
 if( p_dialog->title != NULL )
@@ -211,6 +212,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 
 -(void)destroyProgressPanel
 {
+b_progress_cancelled = YES;
 [o_prog_bar stopAnimation: self];
 [o_prog_win close];
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: hide the playlist without option click when showing the video in a separate window (refs #6213)

2012-03-01 Thread Felix Paul Kühne 
vlc | branch: master | Felix Paul Kühne  | Thu Mar  1 
19:01:50 2012 +0100| [566b0cd4405f9c9022789ce43c86ec5ee4753acf] | committer: 
Felix Paul Kühne

macosx: hide the playlist without option click when showing the video in a 
separate window (refs #6213)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=566b0cd4405f9c9022789ce43c86ec5ee4753acf
---

 modules/gui/macosx/MainWindow.m |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 28f70ed..c721725 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -590,7 +590,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
 
 - (IBAction)togglePlaylist:(id)sender
 {
-if ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) && 
!b_splitview_removed)
+if ( ((([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0) 
&& !b_splitview_removed) || (b_nonembedded && [[VLCMain sharedInstance] 
activeVideoPlayback] && sender != nil) )
 {
 [self hideSplitView];
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] gnutls: simplify x509 certs loading, no need for O_DIRECTORY

2012-03-01 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Thu Mar  1 
19:32:08 2012 +0200| [54ff6997ce186837319168090a588d543fa35a3e] | committer: 
Rémi Denis-Courmont

gnutls: simplify x509 certs loading, no need for O_DIRECTORY

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=54ff6997ce186837319168090a588d543fa35a3e
---

 modules/misc/gnutls.c |   46 +++---
 1 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index d52d3ec..f4733f9 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -399,9 +399,9 @@ gnutls_SessionPrioritize (vlc_object_t *obj, 
gnutls_session_t session)
  * Loads x509 credentials from a file descriptor (directory or regular file)
  * and closes the descriptor.
  */
-static void gnutls_Addx509FD (vlc_object_t *obj,
-  gnutls_certificate_credentials_t cred,
-  int fd, bool priv, unsigned recursion)
+static void gnutls_x509_AddFD (vlc_object_t *obj,
+   gnutls_certificate_credentials_t cred,
+   int fd, bool priv, unsigned recursion)
 {
 DIR *dir = fdopendir (fd);
 if (dir != NULL)
@@ -426,7 +426,7 @@ static void gnutls_Addx509FD (vlc_object_t *obj,
 if (nfd != -1)
 {
 msg_Dbg (obj, "loading x509 credentials from %s...", ent);
-gnutls_Addx509FD (obj, cred, nfd, priv, recursion);
+gnutls_x509_AddFD (obj, cred, nfd, priv, recursion);
 }
 else
 msg_Dbg (obj, "cannot access x509 credentials in %s", ent);
@@ -462,27 +462,11 @@ static void gnutls_Addx509FD (vlc_object_t *obj,
 close (fd);
 }
 
-static void gnutls_Addx509Directory (vlc_object_t *obj,
- gnutls_certificate_credentials cred,
- const char *path, bool priv)
+static void gnutls_x509_AddPath (vlc_object_t *obj,
+ gnutls_certificate_credentials cred,
+ const char *path, bool priv)
 {
-msg_Dbg (obj, "browsing x509 credentials in %s...", path);
-int fd = vlc_open (path, O_RDONLY|O_DIRECTORY);
-if (fd == -1)
-{
-msg_Warn (obj, "cannot access x509 in %s: %m", path);
-return;
-}
-
-gnutls_Addx509FD (obj, cred, fd, priv, 5);
-}
-
-static void gnutls_Addx509File (vlc_object_t *obj,
-gnutls_certificate_credentials cred,
-const char *path, bool priv)
-{
-msg_Dbg (obj, "loading x509 credentials from %s...", path);
-
+msg_Dbg (obj, "loading x509 credentials in %s...", path);
 int fd = vlc_open (path, O_RDONLY);
 if (fd == -1)
 {
@@ -490,7 +474,7 @@ static void gnutls_Addx509File (vlc_object_t *obj,
 return;
 }
 
-gnutls_Addx509FD (obj, cred, fd, priv, 0);
+gnutls_x509_AddFD (obj, cred, fd, priv, 5);
 }
 #else /* WIN32 */
 static int
@@ -557,14 +541,14 @@ static int OpenClient (vlc_tls_t *session, int fd, const 
char *hostname)
 char *userdir = config_GetUserDir (VLC_DATA_DIR);
 if (userdir != NULL)
 {
-char path[strlen (userdir) + sizeof ("/ssl/private")];
+char path[strlen (userdir) + sizeof ("/ssl/private/")];
 sprintf (path, "%s/ssl", userdir);
 vlc_mkdir (path, 0755);
 
-sprintf (path, "%s/ssl/certs", userdir);
-gnutls_Addx509Directory (VLC_OBJECT(session), sys->x509_cred, path, 
false);
-sprintf (path, "%s/ssl/private", userdir);
-gnutls_Addx509Directory (VLC_OBJECT(session), sys->x509_cred, path, 
true);
+sprintf (path, "%s/ssl/certs/", userdir);
+gnutls_x509_AddPath (VLC_OBJECT(session), sys->x509_cred, path, false);
+sprintf (path, "%s/ssl/private/", userdir);
+gnutls_x509_AddPath (VLC_OBJECT(session), sys->x509_cred, path, true);
 free (userdir);
 }
 
@@ -573,7 +557,7 @@ static int OpenClient (vlc_tls_t *session, int fd, const 
char *hostname)
 char path[strlen (confdir)
+ sizeof ("/ssl/certs/ca-certificates.crt")];
 sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
-gnutls_Addx509File (VLC_OBJECT(session), sys->x509_cred, path, false);
+gnutls_x509_AddPath (VLC_OBJECT(session), sys->x509_cred, path, false);
 }
 #else /* WIN32 */
 gnutls_loadOSCAList (VLC_OBJECT(session), sys->x509_cred);

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Fix MacOS compilation (probably)

2012-03-01 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Thu Mar  1 
19:28:37 2012 +0200| [7222ec271911a579b95ed57b48956787f850e0a7] | committer: 
Rémi Denis-Courmont

Fix MacOS compilation (probably)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7222ec271911a579b95ed57b48956787f850e0a7
---

 compat/posix_memalign.c |   18 +++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/compat/posix_memalign.c b/compat/posix_memalign.c
index cd89a0f..b273385 100644
--- a/compat/posix_memalign.c
+++ b/compat/posix_memalign.c
@@ -25,9 +25,6 @@
 #include 
 #include 
 
-#ifndef WIN32
-#include 
-
 static int check_align (size_t align)
 {
 for (size_t i = sizeof (void *); i != 0; i *= 2)
@@ -36,6 +33,9 @@ static int check_align (size_t align)
 return EINVAL;
 }
 
+#if !defined (WIN32) && !defined (__APPLE__)
+#include 
+
 int posix_memalign (void **ptr, size_t align, size_t size)
 {
 if (check_align (align))
@@ -52,4 +52,16 @@ int posix_memalign (void **ptr, size_t align, size_t size)
 *ptr = p;
 return 0;
 }
+
+#else
+
+int posix_memalign (void **ptr, size_t align, size_t size)
+{
+if (check_align (align))
+return EINVAL;
+
+*ptr = NULL;
+return size ? ENOMEM : 0;
+}
+
 #endif

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Remove the old glibc version check

2012-03-01 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Thu Mar  1 
19:24:40 2012 +0200| [9ae29b39d12b30d0266842466f3ac8239d3cb005] | committer: 
Rémi Denis-Courmont

Remove the old glibc version check

This is not so relevant anymore and was only a warning anyway.
(We cannot avoid the bug in LibVLC.)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9ae29b39d12b30d0266842466f3ac8239d3cb005
---

 src/Makefile.am|1 +
 src/posix/linux_specific.c |   32 
 2 files changed, 1 insertions(+), 32 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 492dcde..b35f38e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -256,6 +256,7 @@ SOURCES_libvlc_linux = \
posix/thread.c \
posix/linux_cpu.c \
posix/linux_specific.c \
+   posix/specific.c \
posix/rand.c \
$(NULL)
 
diff --git a/src/posix/linux_specific.c b/src/posix/linux_specific.c
index 28dbed1..7cc7a78 100644
--- a/src/posix/linux_specific.c
+++ b/src/posix/linux_specific.c
@@ -73,35 +73,3 @@ char *config_GetLibDir (void)
 error:
 return (path != NULL) ? path : strdup (PKGLIBDIR);
 }
-
-#ifdef __GLIBC__
-# include 
-# include 
-#endif
-
-void system_Init (void)
-{
-#ifdef __GLIBC__
-const char *glcv = gnu_get_libc_version ();
-
-/* gettext in glibc 2.5-2.7 is not thread-safe. LibVLC keeps crashing,
- * especially in sterror_r(). Even if we have NLS disabled, the calling
- * process might have called setlocale(). */
-if (strverscmp (glcv, "2.5") >= 0 && strverscmp (glcv, "2.8") < 0)
-{
-fputs ("LibVLC has detected an unusable buggy GNU/libc version.\n"
-   "Please update to version 2.8 or newer.\n", stderr);
-fflush (stderr);
-}
-#endif
-}
-
-void system_Configure (libvlc_int_t *libvlc,
-   int argc, const char *const argv[])
-{
-(void)libvlc; (void)argc; (void)argv;
-}
-
-void system_End (void)
-{
-}

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Work around automake bug (?) to distribute contribs

2012-03-01 Thread Rémi Denis-Courmont 
vlc | branch: master | Rémi Denis-Courmont  | Thu Mar  1 
19:06:20 2012 +0200| [49399c2720db101476aed2014c58444929357e19] | committer: 
Rémi Denis-Courmont

Work around automake bug (?) to distribute contribs

Files were copied to contrib/src/src instead of contrib/src...

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=49399c2720db101476aed2014c58444929357e19
---

 Makefile.am |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0245d71..178c901 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -381,7 +381,7 @@ EXTRA_DIST += \
 ##
 EXTRA_DIST += \
contrib/bootstrap \
-   contrib/src/
+   contrib/src
 
 ###
 # Building libvlc

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: cosmetics

2012-03-01 Thread Felix Paul Kühne 
vlc/vlc-2.0 | branch: master | Felix Paul Kühne  | Thu 
Mar  1 17:46:09 2012 +0100| [90172d0239773fd275e4c3cfb897d6d504a3ba4e] | 
committer: Felix Paul Kühne

macosx: cosmetics
(cherry picked from commit 1e952e5ee6cfd2e0479a6589802234c46e65d2f0)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=90172d0239773fd275e4c3cfb897d6d504a3ba4e
---

 modules/gui/macosx/coredialogs.m |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/coredialogs.m b/modules/gui/macosx/coredialogs.m
index 384ea8b..dcda482 100644
--- a/modules/gui/macosx/coredialogs.m
+++ b/modules/gui/macosx/coredialogs.m
@@ -79,7 +79,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 else if( [o_type isEqualToString: @"dialog-login"] )
 [self performSelectorOnMainThread:@selector(showLoginDialog:) 
withObject:o_value waitUntilDone:YES];
 else if( [o_type isEqualToString: @"dialog-progress-bar"] )
-[self performSelector:@selector(showProgressDialogOnMainThread:) 
withObject: o_value afterDelay:3.00];
+[self 
performSelectorOnMainThread:@selector(showProgressDialogOnMainThread:) 
withObject: o_value waitUntilDone:YES];
 else
 msg_Err( VLCIntf, "unhandled dialog type: '%s'", type );
 }
@@ -166,13 +166,16 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 /* we work-around a Cocoa limitation here, since you cannot delay an 
execution
  * on the main thread within a single call */
 if (VLCIntf)
-[self performSelectorOnMainThread:@selector(showProgressDialog:) 
withObject:o_value waitUntilDone:YES];
+[self performSelector:@selector(showProgressDialog:) withObject: 
o_value afterDelay:3.00];
 }
 
 -(void)showProgressDialog: (NSValue *)o_value
 {
 dialog_progress_bar_t *p_dialog = [o_value pointerValue];
 
+if (!p_dialog)
+return;
+
 if( p_dialog->title != NULL )
 {
 [o_prog_win setTitle: [NSString stringWithUTF8String: 
p_dialog->title]];

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: cosmetics

2012-03-01 Thread Felix Paul Kühne 
vlc | branch: master | Felix Paul Kühne  | Thu Mar  1 
17:46:09 2012 +0100| [1e952e5ee6cfd2e0479a6589802234c46e65d2f0] | committer: 
Felix Paul Kühne

macosx: cosmetics

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e952e5ee6cfd2e0479a6589802234c46e65d2f0
---

 modules/gui/macosx/coredialogs.m |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/coredialogs.m b/modules/gui/macosx/coredialogs.m
index 384ea8b..dcda482 100644
--- a/modules/gui/macosx/coredialogs.m
+++ b/modules/gui/macosx/coredialogs.m
@@ -79,7 +79,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 else if( [o_type isEqualToString: @"dialog-login"] )
 [self performSelectorOnMainThread:@selector(showLoginDialog:) 
withObject:o_value waitUntilDone:YES];
 else if( [o_type isEqualToString: @"dialog-progress-bar"] )
-[self performSelector:@selector(showProgressDialogOnMainThread:) 
withObject: o_value afterDelay:3.00];
+[self 
performSelectorOnMainThread:@selector(showProgressDialogOnMainThread:) 
withObject: o_value waitUntilDone:YES];
 else
 msg_Err( VLCIntf, "unhandled dialog type: '%s'", type );
 }
@@ -166,13 +166,16 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 /* we work-around a Cocoa limitation here, since you cannot delay an 
execution
  * on the main thread within a single call */
 if (VLCIntf)
-[self performSelectorOnMainThread:@selector(showProgressDialog:) 
withObject:o_value waitUntilDone:YES];
+[self performSelector:@selector(showProgressDialog:) withObject: 
o_value afterDelay:3.00];
 }
 
 -(void)showProgressDialog: (NSValue *)o_value
 {
 dialog_progress_bar_t *p_dialog = [o_value pointerValue];
 
+if (!p_dialog)
+return;
+
 if( p_dialog->title != NULL )
 {
 [o_prog_win setTitle: [NSString stringWithUTF8String: 
p_dialog->title]];

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: fixed track synchronization panel (close #6233)

2012-03-01 Thread Felix Paul Kühne 
vlc/vlc-2.0 | branch: master | Felix Paul Kühne  | Thu 
Mar  1 17:24:19 2012 +0100| [cfd8b9da06ac2e2133f8cd471eb519c852792d72] | 
committer: Felix Paul Kühne

macosx: fixed track synchronization panel (close #6233)
(cherry picked from commit 5d6ac80bae137c6b36730a4fe82841ef3eec0099)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=cfd8b9da06ac2e2133f8cd471eb519c852792d72
---

 NEWS   |1 +
 .../macosx/Resources/English.lproj/SyncTracks.xib  |  350 +++-
 modules/gui/macosx/TrackSynchronization.h  |7 +-
 modules/gui/macosx/TrackSynchronization.m  |   56 ++--
 modules/gui/macosx/intf.m  |1 +
 5 files changed, 233 insertions(+), 182 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=cfd8b9da06ac2e2133f8cd471eb519c852792d72
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: fixed track synchronization panel (close #6233)

2012-03-01 Thread Felix Paul Kühne 
vlc | branch: master | Felix Paul Kühne  | Thu Mar  1 
17:24:19 2012 +0100| [5d6ac80bae137c6b36730a4fe82841ef3eec0099] | committer: 
Felix Paul Kühne

macosx: fixed track synchronization panel (close #6233)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d6ac80bae137c6b36730a4fe82841ef3eec0099
---

 .../macosx/Resources/English.lproj/SyncTracks.xib  |  350 +++-
 modules/gui/macosx/TrackSynchronization.h  |7 +-
 modules/gui/macosx/TrackSynchronization.m  |   56 ++--
 modules/gui/macosx/intf.m  |1 +
 4 files changed, 232 insertions(+), 182 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=5d6ac80bae137c6b36730a4fe82841ef3eec0099
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Remove unused PLUGINS variable

2012-03-01 Thread Rafaël Carré 
vlc | branch: master | Rafaël Carré  | Wed Feb 29 17:32:16 
2012 -0500| [91df5145e02822572c0fcc8f341b371c34817890] | committer: Rafaël Carré

Remove unused PLUGINS variable

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=91df5145e02822572c0fcc8f341b371c34817890
---

 configure.ac |5 -
 m4/vlc.m4|1 -
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6044d98..2a74fe6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4114,11 +4114,6 @@ dnl
 CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS}"
 
 dnl
-dnl Sort the modules list
-dnl
-PLUGINS=$( (for i in `echo $PLUGINS`; do echo $i; done)|sort|xargs )
-
-dnl
 dnl  Configuration is finished
 dnl
 AC_SUBST(SYS)
diff --git a/m4/vlc.m4 b/m4/vlc.m4
index ee5f8b7..1adec40 100644
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -7,7 +7,6 @@ m4_pattern_allow([^PKG_CONFIG(_LIBDIR)?$])
 
 AC_DEFUN([VLC_ADD_PLUGIN], [
   m4_foreach_w([element], [$1], [
-[PLUGINS="${PLUGINS} ]element["]
 AC_SUBST([LTLIB]element, [lib]element[_plugin.la])
   ])
 ])

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Escape double quotes when creating 'compile'

2012-03-01 Thread Maciej Blizinski 
vlc/vlc-2.0 | branch: master | Maciej Blizinski  | Wed Feb 
29 15:59:46 2012 +0100| [87802f4c3a9ca221f4e2fbc822cd9968dab68d9c] | committer: 
Jean-Baptiste Kempf

Escape double quotes when creating 'compile'

Signed-off-by: Rafaël Carré 
(cherry picked from commit 96f3458656bbb207ffe0d15678ca96ae38c8f5d9)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=87802f4c3a9ca221f4e2fbc822cd9968dab68d9c
---

 configure.ac |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2384f4c..7e4a73f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4338,7 +4338,7 @@ echo "#! $SHELL
 rm -f .error\$\$
 ERROR=0
 export PATH=\"$PATH\" LANG=C
-($MAKE V=1 \$@ 2>&1 || touch .error\$\$)| `sed -ne "s/^top_srcdir *= *//p" < 
Makefile`/extras/buildsystem/make.pl
+($MAKE V=1 \$@ 2>&1 || touch .error\$\$)| `sed -ne \"s/^top_srcdir *= *//p\" < 
Makefile`/extras/buildsystem/make.pl
 test -f .error\$\$ && ERROR=1
 rm -f .error\$\$
 exit \$ERROR" >compile

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Gradfun: do not crash on exit on Win32

2012-03-01 Thread Jean-Baptiste Kempf 
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf  | Thu 
Mar  1 11:12:20 2012 +0100| [d72cab6583b67dfa6ecdd4f92053cd3210dc7aa8] | 
committer: Jean-Baptiste Kempf

Gradfun: do not crash on exit on Win32

vlc_memalign data should be vlc_free'd

Close #6114 #6280
(cherry picked from commit 35d2292855c399fcbcc5ef6116580db2350060f7)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=d72cab6583b67dfa6ecdd4f92053cd3210dc7aa8
---

 modules/video_filter/gradfun.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/video_filter/gradfun.c b/modules/video_filter/gradfun.c
index 4a35f33..5c0eb07 100644
--- a/modules/video_filter/gradfun.c
+++ b/modules/video_filter/gradfun.c
@@ -161,7 +161,7 @@ static void Close(vlc_object_t *object)
 
 var_DelCallback(filter, CFG_PREFIX "radius",   Callback, NULL);
 var_DelCallback(filter, CFG_PREFIX "strength", Callback, NULL);
-free(sys->cfg.buf);
+vlc_free(sys->cfg.buf);
 vlc_mutex_destroy(&sys->lock);
 free(sys);
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Fix a typo in the fourcc definition list affecting I444.

2012-03-01 Thread Sam Hocevar 
vlc/vlc-2.0 | branch: master | Sam Hocevar  | Sun Oct 17 
19:28:56 2010 +0200| [5d8f52cd0d4cc169de4da52c0ee0193e218b24c4] | committer: 
Jean-Baptiste Kempf

Fix a typo in the fourcc definition list affecting I444.
(cherry picked from commit 8e34ab46a299beaf465db2913588e08748365751)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=5d8f52cd0d4cc169de4da52c0ee0193e218b24c4
---

 src/misc/fourcc.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index c354382..9410d77 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -694,7 +694,7 @@ static const entry_t p_list_video[] = {
 A("IYUV"),
 B(VLC_CODEC_I422, "Planar 4:2:2 YUV"),
 A("I422"),
-B(VLC_CODEC_I444, "Planar 4:4:0 YUV"),
+B(VLC_CODEC_I440, "Planar 4:4:0 YUV"),
 A("I440"),
 B(VLC_CODEC_I444, "Planar 4:4:4 YUV"),
 A("I444"),

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Contribs: add an option to optimize a bit for the size

2012-03-01 Thread Jean-Baptiste Kempf 
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf  | Thu 
Feb  9 00:07:16 2012 +0100| [56e5996142a7f20ebdf5e2277ded797ba7e164db] | 
committer: Jean-Baptiste Kempf

Contribs: add an option to optimize a bit for the size

Notably for libavcodec

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit 55295e3dcef97dc06659a58aeb7cf97022e92dfb)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=56e5996142a7f20ebdf5e2277ded797ba7e164db
---

 contrib/bootstrap|5 +
 contrib/src/ffmpeg/rules.mak |5 -
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index a4b5410..32db642 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -28,6 +28,7 @@ usage()
echo "  --enable-FOO configure to build package FOO"
echo "  --disable-disc   configure to not build optical discs packages"
echo "  --disable-sout   configure to not build stream output packages"
+   echo "  --enable-small   optimize libraries for size with slight speed 
decrease [DANGEROUS]"
 }
 
 BUILD=
@@ -66,6 +67,9 @@ do
--disable-sout)
BUILD_ENCODERS=
;;
+   --enable-small)
+   ENABLE_SMALL=1
+   ;;
--disable-*)
PKGS_DISABLE="${PKGS_DISABLE} ${1#--disable-}"
;;
@@ -161,6 +165,7 @@ check_android_sdk()
 test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
 test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
 test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
+test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
 
 #
 # Checks
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index e92c191..b57989e 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -32,7 +32,10 @@ FFMPEGCONF += --enable-libmp3lame --enable-libvpx
 DEPS_ffmpeg += lame $(DEPS_lame) vpx $(DEPS_vpx)
 else
 FFMPEGCONF += --disable-encoders --disable-muxers
-# XXX: REVISIT --enable-small ?
+endif
+
+ifdef ENABLE_SMALL
+FFMPEGCONF += --enable-small --optflags=-O2
 endif
 
 # XXX: REVISIT

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Contribs: vpx: fix typo.

2012-03-01 Thread Konstantin Pavlov 
vlc/vlc-2.0 | branch: master | Konstantin Pavlov  | Wed 
Feb 29 18:22:57 2012 +0400| [b62231db741c2d9d2c76610f4c37f5a4b63ef0ae] | 
committer: Jean-Baptiste Kempf

Contribs: vpx: fix typo.
(cherry picked from commit 68e67843a4a37100f24f38167c89c427dcdf7986)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=b62231db741c2d9d2c76610f4c37f5a4b63ef0ae
---

 contrib/src/vpx/rules.mak |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 68b7998..886278b 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -40,7 +40,7 @@ VPX_ARCH := ppc32
 else ifeq ($(ARCH),ppc64)
 VPX_ARCH := ppc64
 else ifeq ($(ARCH),sparc)
-VPX_ARCH := sparch
+VPX_ARCH := sparc
 else ifeq ($(ARCH),x86_64)
 VPX_ARCH := x86_64
 endif

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Gradfun: do not crash on exit on Win32

2012-03-01 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Thu Mar  1 
11:12:20 2012 +0100| [35d2292855c399fcbcc5ef6116580db2350060f7] | committer: 
Jean-Baptiste Kempf

Gradfun: do not crash on exit on Win32

vlc_memalign data should be vlc_free'd

Close #6114 #6280

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=35d2292855c399fcbcc5ef6116580db2350060f7
---

 modules/video_filter/gradfun.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/video_filter/gradfun.c b/modules/video_filter/gradfun.c
index 39358af..98d9860 100644
--- a/modules/video_filter/gradfun.c
+++ b/modules/video_filter/gradfun.c
@@ -161,7 +161,7 @@ static void Close(vlc_object_t *object)
 
 var_DelCallback(filter, CFG_PREFIX "radius",   Callback, NULL);
 var_DelCallback(filter, CFG_PREFIX "strength", Callback, NULL);
-free(sys->cfg.buf);
+vlc_free(sys->cfg.buf);
 vlc_mutex_destroy(&sys->lock);
 free(sys);
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Add Keywords to the vlc.desktop file

2012-03-01 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Thu Mar  1 
10:40:46 2012 +0100| [2eba8b99b7b7b5c64041d374718ce3d7ff17a0b8] | committer: 
Jean-Baptiste Kempf

Add Keywords to the vlc.desktop file

Close #6275
Close LP:943014

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2eba8b99b7b7b5c64041d374718ce3d7ff17a0b8
---

 share/vlc.desktop.in |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/share/vlc.desktop.in b/share/vlc.desktop.in
index 365c964..741e983 100644
--- a/share/vlc.desktop.in
+++ b/share/vlc.desktop.in
@@ -87,6 +87,7 @@ TryExec=@bindir@/vlc
 Icon=vlc
 Terminal=false
 Type=Application
-Categories=AudioVideo;Player;
+Categories=AudioVideo;Player;Recorder;
 
MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;video/x-flv;video/vnd.rn-realvideo;video/mp4;video/mp4v-es;video/mp2t;application/ogg;application/x-ogg;video/x-ogm+ogg;audio/x-vorbis+ogg;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm;audio/webm;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;audio/amr;audio/amr-wb;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;applic
 
ation/xspf+xml;x-scheme-handler/mms;x-scheme-handler/rtmp;x-scheme-handler/rtsp;
 X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb
+Keywords=Player;Capture;DVD;Audio;Video;Server;Broadcast;

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Add Keywords to the vlc.desktop file

2012-03-01 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Thu Mar  1 
10:40:46 2012 +0100| [91e9482d0cbcb65fc4fbc4220e595d85a565cbd0] | committer: 
Jean-Baptiste Kempf

Add Keywords to the vlc.desktop file

Close #6275
Close LP:943014

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=91e9482d0cbcb65fc4fbc4220e595d85a565cbd0
---

 share/vlc.desktop.in |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/share/vlc.desktop.in b/share/vlc.desktop.in
index 365c964..6dab536 100644
--- a/share/vlc.desktop.in
+++ b/share/vlc.desktop.in
@@ -87,6 +87,7 @@ TryExec=@bindir@/vlc
 Icon=vlc
 Terminal=false
 Type=Application
-Categories=AudioVideo;Player;
+Categories=AudioVideo;Player;Recorder
 
MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;video/x-flv;video/vnd.rn-realvideo;video/mp4;video/mp4v-es;video/mp2t;application/ogg;application/x-ogg;video/x-ogm+ogg;audio/x-vorbis+ogg;application/x-matroska;audio/x-matroska;video/x-matroska;video/webm;audio/webm;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;audio/amr;audio/amr-wb;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;applic
 
ation/xspf+xml;x-scheme-handler/mms;x-scheme-handler/rtmp;x-scheme-handler/rtsp;
 X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb
+Keywords=Player;Capture;DVD;Audio;Video;Server;Broadcast

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits