[vlc-commits] Qt: video filter helper for getting the filter type
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri Aug 15
07:53:47 2014 +0200| [78ea3f23df02fa470d0d9de50ab9306348014d2f] | committer:
Jean-Baptiste Kempf
Qt: video filter helper for getting the filter type
Ref #11613
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=78ea3f23df02fa470d0d9de50ab9306348014d2f
---
modules/gui/qt4/components/extended_panels.cpp | 31 ++--
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/modules/gui/qt4/components/extended_panels.cpp
b/modules/gui/qt4/components/extended_panels.cpp
index bbff25a..359a00d 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -354,39 +354,34 @@ static void ChangeAFiltersString( struct intf_thread_t
*p_intf, const char *psz_
free( psz_string );
}
-static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char
*psz_name, bool b_add )
+static const char* GetVFilterType( struct intf_thread_t *p_intf, const char
*psz_name )
{
-char *psz_string;
-const char *psz_filter_type;
-
module_t *p_obj = module_find( psz_name );
if( !p_obj )
{
msg_Err( p_intf, Unable to find filter module \%s\., psz_name );
-return;
+return NULL;
}
if( module_provides( p_obj, video splitter ) )
-{
-psz_filter_type = video-splitter;
-}
+return video-splitter;
else if( module_provides( p_obj, video filter2 ) )
-{
-psz_filter_type = video-filter;
-}
+return video-filter;
else if( module_provides( p_obj, sub source ) )
-{
-psz_filter_type = sub-source;
-}
+return sub-source;
else if( module_provides( p_obj, sub filter ) )
-{
-psz_filter_type = sub-filter;
-}
+return sub-filter;
else
{
msg_Err( p_intf, Unknown video filter type. );
-return;
+return NULL;
}
+}
+
+static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char
*psz_name, bool b_add )
+{
+char *psz_string;
+const char *psz_filter_type = GetVFilterType( p_intf, psz_name );
psz_string = ChangeFiltersString( p_intf, psz_filter_type, psz_name, b_add
);
if( !psz_string )
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: PostProc getter helper
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri Aug 15
08:05:42 2014 +0200| [36f457d0ad9bb8dabfac5a51328799c48ed33a9f] | committer:
Jean-Baptiste Kempf
Qt: PostProc getter helper
Ref #11613
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=36f457d0ad9bb8dabfac5a51328799c48ed33a9f
---
modules/gui/qt4/components/extended_panels.cpp | 12
modules/gui/qt4/components/extended_panels.hpp |1 +
2 files changed, 13 insertions(+)
diff --git a/modules/gui/qt4/components/extended_panels.cpp
b/modules/gui/qt4/components/extended_panels.cpp
index e3120a0..924f890 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -698,6 +698,18 @@ void ExtVideo::updateFilterOptions()
setFilterOption( p_intf, qtu( module ), qtu( option ), i_int, f_float,
val);
}
+int ExtVideo::getPostprocessing( struct intf_thread_t *p_intf)
+{
+char *psz_config = config_GetPsz(p_intf, video-filter);
+int i_q = -1;
+if (psz_config) {
+if (strstr(psz_config, postproc))
+i_q = config_GetInt(p_intf, postproc-q);
+free(psz_config);
+}
+return i_q;
+}
+
void ExtVideo::setPostprocessing( struct intf_thread_t *p_intf, int q)
{
const char *psz_name = postproc;
diff --git a/modules/gui/qt4/components/extended_panels.hpp
b/modules/gui/qt4/components/extended_panels.hpp
index 9659a61..b4c71ea 100644
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -47,6 +47,7 @@ class ExtVideo: public QObject
public:
ExtVideo( struct intf_thread_t *, QTabWidget * );
static void setPostprocessing( struct intf_thread_t *, int q);
+static int getPostprocessing( struct intf_thread_t *p_intf);
private:
Ui::ExtVideoWidget ui;
QSignalMapper* filterMapper;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: fix the postprocessing menu
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri Aug 15
09:26:25 2014 +0200| [d65b41f4da915e148a42b5699962947134fcc7dd] | committer:
Jean-Baptiste Kempf
Qt: fix the postprocessing menu
Close #11613
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d65b41f4da915e148a42b5699962947134fcc7dd
---
modules/gui/qt4/menus.cpp | 35 +--
modules/gui/qt4/menus.hpp |3 +++
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index a29333b..4bd45b3 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -50,6 +50,7 @@
#include util/qmenuview.hpp /* Simple Playlist menu */
#include components/playlist/playlist_model.hpp /* PLModel getter */
#include components/playlist/standardpanel.hpp /* PLView getter */
+#include components/extended_panels.hpp
#include QMenu
#include QMenuBar
@@ -83,6 +84,7 @@ static QActionGroup *currentGroup;
QMenu *VLCMenuBar::recentsMenu = NULL;
QMenu *VLCMenuBar::audioDeviceMenu = NULL;
+QMenu *VLCMenuBar::ppMenu = NULL;
/**
* @brief Add static entries to DP in menus
@@ -247,7 +249,8 @@ static int VideoAutoMenuBuilder( playlist_t *pl,
input_thread_t *p_input,
PUSH_VAR( crop );
PUSH_VAR( deinterlace );
PUSH_VAR( deinterlace-mode );
-PUSH_VAR( postprocess );
+
+VLCMenuBar::ppMenu-setEnabled( p_object != NULL );
if( p_object )
vlc_object_release( p_object );
@@ -684,7 +687,8 @@ QMenu *VLCMenuBar::VideoMenu( intf_thread_t *p_intf, QMenu
*current )
/* Rendering modifiers */
addActionWithSubmenu( current, deinterlace, qtr( Deinterlace ) );
addActionWithSubmenu( current, deinterlace-mode, qtr( Deinterlace
mode ) );
-addActionWithSubmenu( current, postprocess, qtr( Post processing
) );
+ppMenu = PPMenu( p_intf );
+current-addMenu( ppMenu );
current-addSeparator();
/* Other actions */
@@ -1656,3 +1660,30 @@ void VLCMenuBar::updateRecents( intf_thread_t *p_intf )
}
}
}
+
+QMenu *VLCMenuBar::PPMenu( intf_thread_t *p_intf )
+{
+int i_q = ExtVideo::getPostprocessing( p_intf );
+
+QMenu *submenu = new QMenu( Post processing );
+
+QActionGroup *actionGroup = new QActionGroup(submenu);
+QAction *action;
+
+#define ADD_PP_ACTION( text, value ) \
+action = new QAction( qtr(text), submenu ); \
+action-setData( value ); \
+action-setCheckable(true); \
+if( value == i_q ) action-setChecked( true ); \
+submenu-addAction( action ); \
+actionGroup-addAction( action );
+
+ADD_PP_ACTION( Disable, -1 );
+submenu-addSeparator();
+ADD_PP_ACTION( Lowest, 1 );
+ADD_PP_ACTION( Middle, 3 );
+ADD_PP_ACTION( Highest, 6 );
+
+CONNECT( actionGroup, triggered( QAction *), ActionsManager::getInstance(
p_intf ), PPaction( QAction * ) );
+return submenu;
+}
diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index b02e939..649e57e 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -99,6 +99,8 @@ public:
};
Q_DECLARE_FLAGS(actionflags, actionflag)
+static QMenu *ppMenu;
+
private:
/* All main Menus */
static QMenu *FileMenu( intf_thread_t *, QWidget *, MainInterface * mi =
NULL );
@@ -133,6 +135,7 @@ private:
}
static QMenu *HelpMenu( QWidget * );
+static QMenu *PPMenu( intf_thread_t *p_intf );
/* Popups Menus */
static void PopupMenuStaticEntries( QMenu *menu );
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: PostProc setter helper
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri Aug 15
07:53:57 2014 +0200| [cca1c1efc30abed41eba0f3b3091735d3cd2e46d] | committer:
Jean-Baptiste Kempf
Qt: PostProc setter helper
Ref #11613
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cca1c1efc30abed41eba0f3b3091735d3cd2e46d
---
modules/gui/qt4/components/extended_panels.cpp | 15 +++
modules/gui/qt4/components/extended_panels.hpp |1 +
2 files changed, 16 insertions(+)
diff --git a/modules/gui/qt4/components/extended_panels.cpp
b/modules/gui/qt4/components/extended_panels.cpp
index 7847442..e3120a0 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -698,6 +698,21 @@ void ExtVideo::updateFilterOptions()
setFilterOption( p_intf, qtu( module ), qtu( option ), i_int, f_float,
val);
}
+void ExtVideo::setPostprocessing( struct intf_thread_t *p_intf, int q)
+{
+const char *psz_name = postproc;
+
+if( q == -1 )
+{
+ChangeVFiltersString( p_intf, psz_name, false );
+}
+else
+{
+ChangeVFiltersString( p_intf, psz_name, false );
+setFilterOption( p_intf, postproc, postproc-q, q, -1, QString() );
+}
+}
+
/**
* v4l2 controls
**/
diff --git a/modules/gui/qt4/components/extended_panels.hpp
b/modules/gui/qt4/components/extended_panels.hpp
index 2e20830..9659a61 100644
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -46,6 +46,7 @@ class ExtVideo: public QObject
friend class ExtendedDialog;
public:
ExtVideo( struct intf_thread_t *, QTabWidget * );
+static void setPostprocessing( struct intf_thread_t *, int q);
private:
Ui::ExtVideoWidget ui;
QSignalMapper* filterMapper;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: helpers for setting video filter values
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri Aug 15
07:18:27 2014 +0200| [c803336b8b6c859bf529dbc944668e63b30e2828] | committer:
Jean-Baptiste Kempf
Qt: helpers for setting video filter values
This is mostly splitting Qt and core code
Ref #11613
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c803336b8b6c859bf529dbc944668e63b30e2828
---
modules/gui/qt4/components/extended_panels.cpp | 127 +---
modules/gui/qt4/components/extended_panels.hpp |2 +
2 files changed, 73 insertions(+), 56 deletions(-)
diff --git a/modules/gui/qt4/components/extended_panels.cpp
b/modules/gui/qt4/components/extended_panels.cpp
index 359a00d..7847442 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -583,106 +583,121 @@ void ExtVideo::setWidgetValue( QObject *widget )
i_type );
}
-void ExtVideo::updateFilterOptions()
+void ExtVideo::setFilterOption( struct intf_thread_t *p_intf, const char
*psz_module, const char *psz_option,
+int i_int, double f_float, QString val )
{
-QString module = ModuleFromWidgetName( sender()-parent() );
-//msg_Dbg( p_intf, Module name: %s, qtu( module ) );
-QString option = OptionFromWidgetName( sender() );
-//msg_Dbg( p_intf, Option name: %s, qtu( option ) );
-
-vlc_object_t *p_obj = ( vlc_object_t * )
-vlc_object_find_name( p_intf-p_libvlc, qtu( module ) );
+vlc_object_t *p_obj = ( vlc_object_t * )vlc_object_find_name(
p_intf-p_libvlc, psz_module );
int i_type;
bool b_is_command;
+
if( !p_obj )
{
-msg_Warn( p_intf, Module %s not found. You'll need to restart the
filter to take the change into account., qtu( module ) );
-i_type = config_GetType( p_intf, qtu( option ) );
+msg_Warn( p_intf, Module %s not found. You'll need to restart the
filter to take the change into account., psz_module );
+i_type = config_GetType( p_intf, psz_option );
b_is_command = false;
}
else
{
-i_type = var_Type( p_obj, qtu( option ) );
+i_type = var_Type( p_obj, psz_option );
if( i_type == 0 )
-i_type = config_GetType( p_intf, qtu( option ) );
+i_type = config_GetType( p_intf, psz_option );
b_is_command = ( i_type VLC_VAR_ISCOMMAND );
}
-/* Try to cast to all the widgets we're likely to encounter. Only
- * one of the casts is expected to work. */
-QSlider*slider= qobject_castQSlider* ( sender() );
-QCheckBox *checkbox = qobject_castQCheckBox* ( sender() );
-QSpinBox *spinbox = qobject_castQSpinBox* ( sender() );
-QDoubleSpinBox *doublespinbox = qobject_castQDoubleSpinBox*( sender() );
-VLCQDial *dial = qobject_castVLCQDial* ( sender() );
-QLineEdit *lineedit = qobject_castQLineEdit* ( sender() );
-QComboBox *combobox = qobject_castQComboBox* ( sender() );
-
i_type = VLC_VAR_CLASS;
if( i_type == VLC_VAR_INTEGER || i_type == VLC_VAR_BOOL )
{
-int i_int = 0;
-if( slider )i_int = slider-value();
-else if( checkbox ) i_int = checkbox-checkState() == Qt::Checked;
-else if( spinbox ) i_int = spinbox-value();
-else if( dial ) i_int = ( 540-dial-value() )%360;
-else if( lineedit ) i_int = lineedit-text().toInt( NULL,16 );
-else if( combobox ) i_int = combobox-itemData(
combobox-currentIndex() ).toInt();
-else msg_Warn( p_intf, Could not find the correct Integer widget );
-config_PutInt( p_intf, qtu( option ), i_int );
+if( i_int == -1 )
+msg_Warn( p_intf, Could not find the correct Integer widget );
+config_PutInt( p_intf, psz_option, i_int );
if( b_is_command )
{
if( i_type == VLC_VAR_INTEGER )
-var_SetInteger( p_obj, qtu( option ), i_int );
+var_SetInteger( p_obj, psz_option, i_int );
else
-var_SetBool( p_obj, qtu( option ), i_int );
+var_SetBool( p_obj, psz_option, i_int );
}
}
else if( i_type == VLC_VAR_FLOAT )
{
-double f_float = 0;
-if( slider ) f_float = ( double )slider-value()
- / ( double )slider-tickInterval();
/* hack alert! */
-else if( doublespinbox ) f_float = doublespinbox-value();
-else if( dial ) f_float = (540 - dial-value()) % 360;
-else if( lineedit ) f_float = lineedit-text().toDouble();
-else msg_Warn( p_intf, Could not find the correct Float widget );
-config_PutFloat( p_intf, qtu( option ), f_float );
+if( f_float == -1 )
+msg_Warn( p_intf, Could not find the correct Float widget );
+config_PutFloat( p_intf, psz_option, f_float );
if(
[vlc-commits] Qt: create a AM::PPAction
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri Aug 15
09:25:22 2014 +0200| [004213d0606e9590eb9454dedf8c0f4715e55dd0] | committer:
Jean-Baptiste Kempf
Qt: create a AM::PPAction
Ref #11613
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=004213d0606e9590eb9454dedf8c0f4715e55dd0
---
modules/gui/qt4/actions_manager.cpp |9 +
modules/gui/qt4/actions_manager.hpp |3 +++
2 files changed, 12 insertions(+)
diff --git a/modules/gui/qt4/actions_manager.cpp
b/modules/gui/qt4/actions_manager.cpp
index 8b79da6..eff40d9 100644
--- a/modules/gui/qt4/actions_manager.cpp
+++ b/modules/gui/qt4/actions_manager.cpp
@@ -34,6 +34,7 @@
#include input_manager.hpp /* THEMIM */
#include main_interface.hpp/* Show playlist */
#include components/controller.hpp /* Toggle FSC controller width */
+#include components/extended_panels.hpp
ActionsManager::ActionsManager( intf_thread_t * _p_i )
{
@@ -201,3 +202,11 @@ void ActionsManager::skipBackward()
THEMIM-getIM()-jumpBwd();
}
+void ActionsManager::PPaction( QAction *a )
+{
+int i_q = -1;
+if( a != NULL )
+i_q = a-data().toInt();
+
+ExtVideo::setPostprocessing( p_intf, i_q );
+}
diff --git a/modules/gui/qt4/actions_manager.hpp
b/modules/gui/qt4/actions_manager.hpp
index ad678c1..543f10a 100644
--- a/modules/gui/qt4/actions_manager.hpp
+++ b/modules/gui/qt4/actions_manager.hpp
@@ -32,6 +32,8 @@
#include util/singleton.hpp
#include QObject
+class QAction;
+
typedef enum actionType_e
{
PLAY_ACTION,
@@ -81,6 +83,7 @@ public slots:
void record();
void skipForward();
void skipBackward();
+void PPaction( QAction * );
protected slots:
void fullscreen();
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: ts: add ARIB support
vlc | branch: master | Naohiro KORIYAMA nkoriy...@gmail.com | Sat Aug 2 10:31:18 2014 +0900| [248519b2c01ce933ccdb0de9f1da1f4cfbd5b893] | committer: Francois Cartegnie demux: ts: add ARIB support Signed-off-by: Francois Cartegnie fcvlc...@free.fr Fixed-by: Francois Cartegnie fcvlc...@free.fr http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=248519b2c01ce933ccdb0de9f1da1f4cfbd5b893 --- modules/demux/ts.c | 147 1 file changed, 138 insertions(+), 9 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=248519b2c01ce933ccdb0de9f1da1f4cfbd5b893 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: ts: return instead of abort()
vlc | branch: master | Francois Cartegnie fcvlc...@free.fr | Fri Aug 15 18:02:42 2014 +0900| [21e724fa751d51b0f10d63ad5467e216383c3fa4] | committer: Francois Cartegnie demux: ts: return instead of abort() http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21e724fa751d51b0f10d63ad5467e216383c3fa4 --- modules/demux/ts.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/demux/ts.c b/modules/demux/ts.c index 14ea4f7..0244f58 100644 --- a/modules/demux/ts.c +++ b/modules/demux/ts.c @@ -1723,7 +1723,7 @@ static void ParsePES( demux_t *p_demux, ts_pid_t *pid, block_t *p_pes ) /* Append a \0 */ p_block = block_Realloc( p_block, 0, p_block-i_buffer + 1 ); if( !p_block ) -abort(); +return; p_block-p_buffer[p_block-i_buffer -1] = '\0'; } else if( pid-es-fmt.i_codec == VLC_CODEC_TELETEXT ) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] DTV: fix CAM build with httpd
vlc | branch: master | Rafaël Carré fun...@videolan.org | Thu Aug 14 11:59:39
2014 +0200| [2b47567fde5caf29be8c7e99c0fbc182534009e5] | committer: Rafaël Carré
DTV: fix CAM build with httpd
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2b47567fde5caf29be8c7e99c0fbc182534009e5
---
modules/access/dtv/en50221.c | 62 ++
1 file changed, 62 insertions(+)
diff --git a/modules/access/dtv/en50221.c b/modules/access/dtv/en50221.c
index ac9bb4c..29e5bf0 100644
--- a/modules/access/dtv/en50221.c
+++ b/modules/access/dtv/en50221.c
@@ -945,6 +945,68 @@ static void ResourceManagerOpen( cam_t * p_cam, unsigned
i_session_id )
*/
#ifdef ENABLE_HTTPD
+
+/
+ * HTTPExtractValue: Extract a GET variable from psz_request
+ /
+static const char *HTTPExtractValue( const char *psz_uri, const char *psz_name,
+char *psz_value, int i_value_max )
+{
+const char *p = psz_uri;
+
+while( (p = strstr( p, psz_name )) )
+{
+/* Verify that we are dealing with a post/get argument */
+if( (p == psz_uri || *(p - 1) == '' || *(p - 1) == '\n')
+ p[strlen(psz_name)] == '=' )
+break;
+p++;
+}
+
+if( p )
+{
+int i_len;
+
+p += strlen( psz_name );
+if( *p == '=' ) p++;
+
+if( strchr( p, '' ) )
+{
+i_len = strchr( p, '' ) - p;
+}
+else
+{
+/* for POST method */
+if( strchr( p, '\n' ) )
+{
+i_len = strchr( p, '\n' ) - p;
+if( i_len *(p+i_len-1) == '\r' ) i_len--;
+}
+else
+{
+i_len = strlen( p );
+}
+}
+i_len = __MIN( i_value_max - 1, i_len );
+if( i_len 0 )
+{
+strncpy( psz_value, p, i_len );
+psz_value[i_len] = '\0';
+}
+else
+{
+strncpy( psz_value, , i_value_max );
+}
+p += i_len;
+}
+else
+{
+strncpy( psz_value, , i_value_max );
+}
+
+return p;
+}
+
/*
* ApplicationInformationEnterMenu
*/
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] livehttp: fixed generated iv in index file
vlc | branch: master | Christian Suloway csulo...@globaleagleent.com | Thu
Aug 14 17:55:35 2014 -0500| [6d7595d821e693391417531cf3c846f2f368b831] |
committer: Rafaël Carré
livehttp: fixed generated iv in index file
Removed extra shift when copying generated iv for output to index file tag
Signed-off-by: Rafaël Carré fun...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6d7595d821e693391417531cf3c846f2f368b831
---
modules/access_output/livehttp.c |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/modules/access_output/livehttp.c b/modules/access_output/livehttp.c
index 25039f8..5cce2d5 100644
--- a/modules/access_output/livehttp.c
+++ b/modules/access_output/livehttp.c
@@ -616,13 +616,14 @@ static int updateIndexAndDel( sout_access_out_t
*p_access, sout_access_out_sys_t
psz_current_uri = strdup( segment-psz_key_uri );
if( p_sys-b_generate_iv )
{
-unsigned long long iv_hi = 0, iv_lo = 0;
-for( unsigned short i = 0; i 8; i++ )
+unsigned long long iv_hi = segment-aes_ivs[0];
+unsigned long long iv_lo = segment-aes_ivs[8];
+for( unsigned short i = 1; i 8; i++ )
{
-iv_hi |= segment-aes_ivs[i] 0xff;
iv_hi = 8;
-iv_lo |= segment-aes_ivs[8+i] 0xff;
+iv_hi |= segment-aes_ivs[i] 0xff;
iv_lo = 8;
+iv_lo |= segment-aes_ivs[8+i] 0xff;
}
ret = fprintf( fp,
#EXT-X-KEY:METHOD=AES-128,URI=\%s\,IV=0X%16.16llx%16.16llx\n,
segment-psz_key_uri, iv_hi, iv_lo );
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: epg: fix update signal
vlc | branch: master | Francois Cartegnie fcvlc...@free.fr | Fri Aug 15 18:30:32 2014 +0900| [1d0f949a8202aa34e8f7f7f7ac2992c9fdd602f2] | committer: Francois Cartegnie Qt: epg: fix update signal http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1d0f949a8202aa34e8f7f7f7ac2992c9fdd602f2 --- modules/gui/qt4/dialogs/epg.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/qt4/dialogs/epg.cpp b/modules/gui/qt4/dialogs/epg.cpp index bedd3da..bf2c1fb 100644 --- a/modules/gui/qt4/dialogs/epg.cpp +++ b/modules/gui/qt4/dialogs/epg.cpp @@ -75,7 +75,7 @@ EpgDialog::EpgDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf ) CONNECT( epg, itemSelectionChanged( EPGItem *), this, displayEvent( EPGItem *) ); CONNECT( THEMIM-getIM(), epgChanged(), this, updateInfos() ); -CONNECT( THEMIM, inputChanged( input_thread_t * ), this, updateInfos() ); +CONNECT( THEMIM, inputChanged( ), this, updateInfos() ); QDialogButtonBox *buttonsBox = new QDialogButtonBox( this ); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: ts: support ARIB TOT and EIT running status
vlc | branch: master | Francois Cartegnie fcvlc...@free.fr | Fri Aug 15
15:36:31 2014 +0900| [4fa1af77fe6ae5661da4f952ce23977288076adf] | committer:
Francois Cartegnie
demux: ts: support ARIB TOT and EIT running status
Signed-off-by: Francois Cartegnie fcvlc...@free.fr
Fixed-by: Francois Cartegnie fcvlc...@free.fr
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4fa1af77fe6ae5661da4f952ce23977288076adf
---
modules/demux/Makefile.am |4 +++
modules/demux/ts.c| 69 +++--
2 files changed, 70 insertions(+), 3 deletions(-)
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 35d8200..64f9884 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -224,6 +224,10 @@ demux_LTLIBRARIES += libplaylist_plugin.la
libts_plugin_la_SOURCES = demux/ts.c mux/mpeg/csa.c mux/mpeg/dvbpsi_compat.h
demux/dvb-text.h
libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
libts_plugin_la_LIBADD = $(DVBPSI_LIBS) $(SOCKET_LIBS)
+if HAVE_ARIBB24
+libts_plugin_la_CFLAGS += $(ARIBB24_CFLAGS)
+libts_plugin_la_LIBADD += $(ARIBB24_LIBS)
+endif
if HAVE_DVBPSI
demux_LTLIBRARIES += libts_plugin.la
endif
diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 0244f58..7637677 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -74,6 +74,11 @@ VLC_FORMAT(1, 2) static void ts_debug(const char *format,
...)
#endif
}
+#ifdef HAVE_ARIBB24
+ #include aribb24/aribb24.h
+ #include aribb24/decoder.h
+#endif
+
typedef enum arib_modes_e
{
ARIBMODE_AUTO = -1,
@@ -320,6 +325,9 @@ struct demux_sys_t
struct
{
arib_modes_e e_mode;
+#ifdef HAVE_ARIBB24
+arib_instance_t *p_instance;
+#endif
} arib;
/* All pid */
@@ -894,6 +902,11 @@ static void Close( vlc_object_t *p_this )
free( p_sys-p_pcrs );
free( p_sys-p_pos );
+#ifdef HAVE_ARIBB24
+if ( p_sys-arib.p_instance )
+arib_instance_destroy( p_sys-arib.p_instance );
+#endif
+
vlc_mutex_destroy( p_sys-csa_lock );
free( p_sys );
}
@@ -2801,7 +2814,35 @@ static char *EITConvertToUTF8( demux_t *p_demux,
bool b_broken )
{
demux_sys_t *p_sys = p_demux-p_sys;
+#ifdef HAVE_ARIBB24
+if( p_sys-arib.e_mode == ARIBMODE_ENABLED )
+{
+if ( !p_sys-arib.p_instance )
+p_sys-arib.p_instance = arib_instance_new( p_demux );
+if ( !p_sys-arib.p_instance )
+return NULL;
+arib_decoder_t *p_decoder = arib_get_decoder( p_sys-arib.p_instance );
+if ( !p_decoder )
+return NULL;
+
+char *psz_outstring = NULL;
+size_t i_out;
+
+i_out = i_length * 4;
+psz_outstring = (char*) calloc( i_out + 1, sizeof(char) );
+if( !psz_outstring )
+return NULL;
+
+arib_initialize_decoder( p_decoder );
+i_out = arib_decode_buffer( p_decoder, psz_instring, i_length,
+psz_outstring, i_out );
+arib_finalize_decoder( p_decoder );
+
+return psz_outstring;
+}
+#else
VLC_UNUSED(p_sys);
+#endif
/* Deal with no longer broken providers (no switch byte
but sending ISO_8859-1 instead of ISO_6937) without
removing them from the broken providers table
@@ -3059,10 +3100,32 @@ static void EITCallBack( demux_t *p_demux,
int64_t i_start;
int i_duration;
int i_min_age = 0;
+int64_t i_tot_time = 0;
i_start = EITConvertStartTime( p_evt-i_start_time );
i_duration = EITConvertDuration( p_evt-i_duration );
+if( p_sys-arib.e_mode == ARIBMODE_ENABLED )
+{
+if( p_sys-i_tdt_delta == 0 )
+p_sys-i_tdt_delta = CLOCK_FREQ * (i_start + i_duration - 5) -
mdate();
+
+//i_start -= 9 * 60 * 60; // JST - UTC
+time_t timer = time( NULL );
+int64_t diff = difftime( mktime( localtime( timer ) ),
+ mktime( gmtime( timer ) ) );
+i_start -= diff;
+i_tot_time = (mdate() + p_sys-i_tdt_delta) / CLOCK_FREQ - diff;
+
+if( p_evt-i_running_status == 0x00
+(i_start - 5 i_tot_time
+ i_tot_time i_start + i_duration + 5) )
+{
+p_evt-i_running_status = 0x04;
+msg_Dbg( p_demux, EIT running status 0x00 - 0x04 );
+}
+}
+
msg_Dbg( p_demux, * event id=%d start_time:%d duration=%d
running=%d free_ca=%d,
p_evt-i_event_id, (int)i_start, (int)i_duration,
@@ -3175,12 +3238,12 @@ static void EITCallBack( demux_t *p_demux,
}
/* */
-if( i_start 0 )
+if( i_start 0 psz_name psz_text)
vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text,
*psz_extra ? psz_extra : NULL, i_min_age );
/* Update now
[vlc-commits] playlist demux: do not set empty art URL
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Fri Aug 15
18:02:18 2014 +0300| [9f507dec83c5ebdcad3baa2bf20be60d0ede82a2] | committer:
Rémi Denis-Courmont
playlist demux: do not set empty art URL
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9f507dec83c5ebdcad3baa2bf20be60d0ede82a2
---
modules/demux/playlist/podcast.c |2 +-
modules/demux/playlist/xspf.c|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index b0c44d9..3c52803 100644
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -210,7 +210,7 @@ static int Demux( demux_t *p_demux )
}
else
{
-if( !strcmp( psz_elname, url ) )
+if( !strcmp( psz_elname, url ) *node )
{
free( psz_art_url );
psz_art_url = strdup( node );
diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index a58782b..dc84a6b 100644
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -547,7 +547,7 @@ static bool set_item_info SIMPLE_INTERFACE
input_item_SetDescription(p_input, psz_value);
else if (!strcmp(psz_name, info))
input_item_SetURL(p_input, psz_value);
-else if (!strcmp(psz_name, image))
+else if (!strcmp(psz_name, image) *psz_value)
input_item_SetArtURL(p_input, psz_value);
return true;
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] input item: remove b_fixed name, always false
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Fri Aug 15 18:33:27 2014 +0300| [eb52eceec79fd9bd02a0ee5e7bfb7b0f4753ea99] | committer: Rémi Denis-Courmont input item: remove b_fixed name, always false http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eb52eceec79fd9bd02a0ee5e7bfb7b0f4753ea99 --- include/vlc_input_item.h |1 - src/input/es_out.c |2 +- src/input/item.c |1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h index bc5b2e5..a701044 100644 --- a/include/vlc_input_item.h +++ b/include/vlc_input_item.h @@ -86,7 +86,6 @@ struct input_item_t vlc_mutex_t lock; /** Lock for the item */ uint8_t i_type; /** Type (file, disc, ... see input_item_type_e) */ -boolb_fixed_name;/** Can the interface change the name ?*/ boolb_error_when_reading;/** Error When Reading */ }; diff --git a/src/input/es_out.c b/src/input/es_out.c index fba5c87..ea7316e 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -1355,7 +1355,7 @@ static void EsOutMeta( es_out_t *p_out, const vlc_meta_t *p_meta ) vlc_mutex_lock( p_item-lock ); -if( vlc_meta_Get( p_meta, vlc_meta_Title ) !p_item-b_fixed_name ) +if( vlc_meta_Get( p_meta, vlc_meta_Title ) ) psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) ); vlc_meta_Merge( p_item-p_meta, p_meta ); diff --git a/src/input/item.c b/src/input/item.c index b27250b..4f0b053 100644 --- a/src/input/item.c +++ b/src/input/item.c @@ -867,7 +867,6 @@ input_item_NewWithType( const char *psz_uri, const char *psz_name, if( type != ITEM_TYPE_UNKNOWN ) p_input-i_type = type; -p_input-b_fixed_name = false; p_input-b_error_when_reading = false; return p_input; } ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] meta: simplify input_ExtractAttachmentAndCacheArt()
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Fri Aug 15
19:03:40 2014 +0300| [39c984278e06ae31e258f6c34170beeb0b4235c4] | committer:
Rémi Denis-Courmont
meta: simplify input_ExtractAttachmentAndCacheArt()
Also improve error messages.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=39c984278e06ae31e258f6c34170beeb0b4235c4
---
src/input/es_out.c |2 +-
src/input/input_internal.h |4 ++--
src/input/meta.c | 42 ++
3 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/src/input/es_out.c b/src/input/es_out.c
index 414970b..f042fa6 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1371,7 +1371,7 @@ static void EsOutMeta( es_out_t *p_out, const vlc_meta_t
*p_meta )
if( p_input-p-p_sout !p_input-b_preparsing )
input_item_SetArtURL( p_item, NULL );
else
-input_ExtractAttachmentAndCacheArt( p_input );
+input_ExtractAttachmentAndCacheArt( p_input, psz_arturl + 13 );
}
free( psz_arturl );
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 9f71294..e23b74d 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -227,8 +227,8 @@ void input_ControlPush( input_thread_t *, int i_type,
vlc_value_t * );
* Item metadata
**/
/* input_ExtractAttachmentAndCacheArt:
- * Becarefull; p_item lock HAS to be taken */
-void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input );
+ * Be careful: p_item lock will be taken! */
+void input_ExtractAttachmentAndCacheArt( input_thread_t *, const char *name );
/***
* Internal prototypes
diff --git a/src/input/meta.c b/src/input/meta.c
index 892b4af..17987e3 100644
--- a/src/input/meta.c
+++ b/src/input/meta.c
@@ -204,26 +204,17 @@ void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t
*src )
}
-void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input )
+void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input,
+ const char *name )
{
input_item_t *p_item = p_input-p-p_item;
-/* */
-char *psz_arturl = input_item_GetArtURL( p_item );
-if( !psz_arturl || strncmp( psz_arturl, attachment://,
strlen(attachment://) ) )
-{
-msg_Err( p_input, internal input error with
input_ExtractAttachmentAndCacheArt );
-free( psz_arturl );
-return;
-}
-
if( input_item_IsArtFetched( p_item ) )
-{
-/* XXX Weird, we should not have end up with attachment:// art url
unless there is a race
- * condition */
-msg_Warn( p_input, internal input error with
input_ExtractAttachmentAndCacheArt );
+{ /* XXX Weird, we should not end up with attachment:// art URL
+ * unless there is a race condition */
+msg_Warn( p_input, art already fetched );
playlist_FindArtInCache( p_item );
-goto exit;
+return;
}
/* */
@@ -232,38 +223,33 @@ void input_ExtractAttachmentAndCacheArt( input_thread_t
*p_input )
vlc_mutex_lock( p_item-lock );
for( int i_idx = 0; i_idx p_input-p-i_attachment; i_idx++ )
{
-if( !strcmp( p_input-p-attachment[i_idx]-psz_name,
- psz_arturl[strlen(attachment://)] ) )
+input_attachment_t *a = p_input-p-attachment[i_idx];
+
+if( !strcmp( a-psz_name, name ) )
{
-p_attachment = vlc_input_attachment_Duplicate(
p_input-p-attachment[i_idx] );
+p_attachment = vlc_input_attachment_Duplicate( a );
break;
}
}
vlc_mutex_unlock( p_item-lock );
-if( !p_attachment || p_attachment-i_data = 0 )
+if( p_attachment == NULL )
{
-if( p_attachment )
-vlc_input_attachment_Delete( p_attachment );
-msg_Warn( p_input, internal input error with
input_ExtractAttachmentAndCacheArt );
-goto exit;
+msg_Warn( p_input, art attachment %s not found, name );
+return;
}
/* */
const char *psz_type = NULL;
+
if( !strcmp( p_attachment-psz_mime, image/jpeg ) )
psz_type = .jpg;
else if( !strcmp( p_attachment-psz_mime, image/png ) )
psz_type = .png;
-/* */
playlist_SaveArt( VLC_OBJECT(p_input), p_item,
p_attachment-p_data, p_attachment-i_data, psz_type );
-
vlc_input_attachment_Delete( p_attachment );
-
-exit:
-free( psz_arturl );
}
int input_item_WriteMeta( vlc_object_t *obj, input_item_t *p_item )
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] input item: attempt to clarify art URL merge
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Fri Aug 15
18:51:57 2014 +0300| [d022a1a7c79b97be53e236d9e2d72b1aef938d95] | committer:
Rémi Denis-Courmont
input item: attempt to clarify art URL merge
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d022a1a7c79b97be53e236d9e2d72b1aef938d95
---
src/input/es_out.c | 33 +
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/src/input/es_out.c b/src/input/es_out.c
index 03a494c..414970b 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1352,33 +1352,26 @@ static void EsOutMeta( es_out_t *p_out, const
vlc_meta_t *p_meta )
if( vlc_meta_Get( p_meta, vlc_meta_Title ) != NULL )
input_item_SetName( p_item, vlc_meta_Get( p_meta, vlc_meta_Title ) );
-char *psz_arturl = input_item_GetArtURL( p_item );
+char *psz_arturl = NULL;
+if( vlc_meta_Get( p_item-p_meta, vlc_meta_ArtworkURL ) != NULL )
+psz_arturl = input_item_GetArtURL( p_item ); /* save value */
vlc_mutex_lock( p_item-lock );
-
vlc_meta_Merge( p_item-p_meta, p_meta );
-
-if( !psz_arturl || *psz_arturl == '\0' )
-{
-const char *psz_tmp = vlc_meta_Get( p_item-p_meta,
vlc_meta_ArtworkURL );
-if( psz_tmp )
-psz_arturl = strdup( psz_tmp );
-}
vlc_mutex_unlock( p_item-lock );
-if( psz_arturl *psz_arturl )
-{
+if( psz_arturl != NULL ) /* restore/favor previously set item art URL */
input_item_SetArtURL( p_item, psz_arturl );
+else
+psz_arturl = input_item_GetArtURL( p_item );
-if( !strncmp( psz_arturl, attachment://, 13 ) )
-{
-/* Don't look for art cover if sout
- * XXX It can change when sout has meta data support */
-if( p_input-p-p_sout !p_input-b_preparsing )
-input_item_SetArtURL( p_item, );
-else
-input_ExtractAttachmentAndCacheArt( p_input );
-}
+if( psz_arturl != NULL !strncmp( psz_arturl, attachment://, 13 ) )
+{ /* Clear art cover if streaming out.
+ * FIXME: Why? Remove this when sout gets meta data support. */
+if( p_input-p-p_sout !p_input-b_preparsing )
+input_item_SetArtURL( p_item, NULL );
+else
+input_ExtractAttachmentAndCacheArt( p_input );
}
free( psz_arturl );
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] input item: simplify copying title from meta
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Fri Aug 15
18:41:21 2014 +0300| [3f9ebd2ff97ea7ca61a61149564584f5f0cb42e1] | committer:
Rémi Denis-Courmont
input item: simplify copying title from meta
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3f9ebd2ff97ea7ca61a61149564584f5f0cb42e1
---
src/input/es_out.c | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/input/es_out.c b/src/input/es_out.c
index ea7316e..03a494c 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1347,17 +1347,15 @@ static void EsOutMeta( es_out_t *p_out, const
vlc_meta_t *p_meta )
{
es_out_sys_t*p_sys = p_out-p_sys;
input_thread_t *p_input = p_sys-p_input;
-
input_item_t *p_item = input_GetItem( p_input );
-char *psz_title = NULL;
+if( vlc_meta_Get( p_meta, vlc_meta_Title ) != NULL )
+input_item_SetName( p_item, vlc_meta_Get( p_meta, vlc_meta_Title ) );
+
char *psz_arturl = input_item_GetArtURL( p_item );
vlc_mutex_lock( p_item-lock );
-if( vlc_meta_Get( p_meta, vlc_meta_Title ) )
-psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) );
-
vlc_meta_Merge( p_item-p_meta, p_meta );
if( !psz_arturl || *psz_arturl == '\0' )
@@ -1384,11 +1382,6 @@ static void EsOutMeta( es_out_t *p_out, const vlc_meta_t
*p_meta )
}
free( psz_arturl );
-if( psz_title )
-{
-input_item_SetName( p_item, psz_title );
-free( psz_title );
-}
input_item_SetPreparsed( p_item, true );
input_SendEventMeta( p_input );
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] input: deduplicate code
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Fri Aug 15
20:16:58 2014 +0300| [04a366e3e6d83495c76452c9fdc2bb6e2c869b77] | committer:
Rémi Denis-Courmont
input: deduplicate code
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=04a366e3e6d83495c76452c9fdc2bb6e2c869b77
---
src/input/input.c | 34 +++---
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/input/input.c b/src/input/input.c
index 43b1dbb..7479653 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -92,7 +92,7 @@ static void SlaveDemux( input_thread_t *p_input, bool
*pb_demux_polled );
static void SlaveSeek( input_thread_t *p_input );
static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta );
-static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta );
+static void InputUpdateMeta( input_thread_t *p_input, demux_t *p_demux );
static void InputGetExtraFiles( input_thread_t *p_input,
int *pi_list, char ***pppsz_list,
const char *psz_access, const char *psz_path );
@@ -1954,7 +1954,6 @@ static bool Control( input_thread_t *p_input,
if( slave !InputSourceInit( p_input, slave, uri, NULL,
false ) )
{
-vlc_meta_t *p_meta;
int64_t i_time;
/* Add the slave */
@@ -1979,12 +1978,7 @@ static bool Control( input_thread_t *p_input,
}
/* Get meta (access and demux) */
-p_meta = vlc_meta_New();
-if( p_meta )
-{
-demux_Control( slave-p_demux, DEMUX_GET_META, p_meta
);
-InputUpdateMeta( p_input, p_meta );
-}
+InputUpdateMeta( p_input, slave-p_demux );
TAB_APPEND( p_input-p-i_slave, p_input-p-slave, slave
);
}
@@ -2140,12 +2134,7 @@ static void UpdateGenericFromDemux( input_thread_t
*p_input )
if( p_demux-info.i_update INPUT_UPDATE_META )
{
-vlc_meta_t *p_meta = vlc_meta_New();
-if( p_meta )
-{
-demux_Control( p_input-p-input.p_demux, DEMUX_GET_META, p_meta );
-InputUpdateMeta( p_input, p_meta );
-}
+InputUpdateMeta( p_input, p_demux );
p_demux-info.i_update = ~INPUT_UPDATE_META;
}
{
@@ -2716,15 +2705,21 @@ static void AppendAttachment( int *pi_attachment,
input_attachment_t ***ppp_atta
* InputUpdateMeta: merge p_item meta data with p_meta taking care of
* arturl and locking issue.
*/
-static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta )
+static void InputUpdateMeta( input_thread_t *p_input, demux_t *p_demux )
{
+vlc_meta_t *p_meta = vlc_meta_New();
+if( unlikely(p_meta == NULL) )
+return;
+
+demux_Control( p_demux, DEMUX_GET_META, p_meta );
+
/* If metadata changed, then the attachments might have changed.
We need to update them in case they contain album art. */
-input_source_t *in = p_input-p-input;
-int i_attachment;
input_attachment_t **attachment;
-if( !demux_Control( in-p_demux, DEMUX_GET_ATTACHMENTS,
- attachment, i_attachment ) )
+int i_attachment;
+
+if( !demux_Control( p_demux, DEMUX_GET_ATTACHMENTS,
+attachment, i_attachment ) )
{
vlc_mutex_lock( p_input-p-p_item-lock );
if( p_input-p-i_attachment 0 )
@@ -2737,6 +2732,7 @@ static void InputUpdateMeta( input_thread_t *p_input,
vlc_meta_t *p_meta )
i_attachment, attachment );
vlc_mutex_unlock( p_input-p-p_item-lock );
}
+
es_out_ControlSetMeta( p_input-p-p_es_out, p_meta );
vlc_meta_Delete( p_meta );
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] input: fetch demux attachment once, not twice (fixes #11966)
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Fri Aug 15
20:07:07 2014 +0300| [fdb9f79e5ffdb566a1b5f5940d83f8cd93f08783] | committer:
Rémi Denis-Courmont
input: fetch demux attachment once, not twice (fixes #11966)
This was inefficient and caused attachments from the meta engine or from
the slave demuxers to get lost.
Note that those attachments will still get lost later if the master
demuxer sets the metadata update flag (which affects the Ogg demuxer
only so far), or when adding a slave input.
All regressions introduced in e4673369e8356c84ca99b66fb222dee07c8e4962.
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fdb9f79e5ffdb566a1b5f5940d83f8cd93f08783
---
src/input/input.c | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/input/input.c b/src/input/input.c
index 91518ff..43b1dbb 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1173,8 +1173,6 @@ static void InitPrograms( input_thread_t * p_input )
static int Init( input_thread_t * p_input )
{
-vlc_meta_t *p_meta;
-
for( int i = 0; i p_input-p-p_item-i_options; i++ )
{
if( !strncmp( p_input-p-p_item-ppsz_options[i], meta-file, 9 ) )
@@ -1253,8 +1251,8 @@ static int Init( input_thread_t * p_input )
p_input-p-b_out_pace_control ? async : sync );
}
-p_meta = vlc_meta_New();
-if( p_meta )
+vlc_meta_t *p_meta = vlc_meta_New();
+if( p_meta != NULL )
{
/* Get meta data from users */
InputMetaUser( p_input, p_meta );
@@ -1266,8 +1264,8 @@ static int Init( input_thread_t * p_input )
for( int i = 0; i p_input-p-i_slave; i++ )
InputSourceMeta( p_input, p_input-p-slave[i], p_meta );
-/* */
-InputUpdateMeta( p_input, p_meta );
+es_out_ControlSetMeta( p_input-p-p_es_out, p_meta );
+vlc_meta_Delete( p_meta );
}
msg_Dbg( p_input, `%s' successfully opened,
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] input: fetch demux attachment once, not twice (fixes #11966)
vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont r...@remlab.net | Fri Aug
15 20:07:07 2014 +0300| [2c5ecf116e565be769237bebde3d2816499dd61f] | committer:
Rémi Denis-Courmont
input: fetch demux attachment once, not twice (fixes #11966)
This was inefficient and caused attachments from the meta engine or from
the slave demuxers to get lost.
Note that those attachments will still get lost later if the master
demuxer sets the metadata update flag (which affects the Ogg demuxer
only so far), or when adding a slave input.
All regressions introduced in e4673369e8356c84ca99b66fb222dee07c8e4962.
(cherry picked from commit fdb9f79e5ffdb566a1b5f5940d83f8cd93f08783)
Conflicts:
src/input/input.c
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2c5ecf116e565be769237bebde3d2816499dd61f
---
src/input/input.c |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/input/input.c b/src/input/input.c
index 917eec4..03c9dcf 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1177,7 +1177,6 @@ static void InitPrograms( input_thread_t * p_input )
static int Init( input_thread_t * p_input )
{
-vlc_meta_t *p_meta;
int i;
for( i = 0; i p_input-p-p_item-i_options; i++ )
@@ -1258,8 +1257,8 @@ static int Init( input_thread_t * p_input )
p_input-p-b_out_pace_control ? async : sync );
}
-p_meta = vlc_meta_New();
-if( p_meta )
+vlc_meta_t *p_meta = vlc_meta_New();
+if( p_meta != NULL )
{
/* Get meta data from users */
InputMetaUser( p_input, p_meta );
@@ -1271,8 +1270,8 @@ static int Init( input_thread_t * p_input )
for( int i = 0; i p_input-p-i_slave; i++ )
InputSourceMeta( p_input, p_input-p-slave[i], p_meta );
-/* */
-InputUpdateMeta( p_input, p_meta );
+es_out_ControlSetMeta( p_input-p-p_es_out, p_meta );
+vlc_meta_Delete( p_meta );
}
msg_Dbg( p_input, `%s' successfully opened,
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: mp4: point to atom's position of base offset is moov (fix #11746)
vlc/vlc-2.2 | branch: master | Francois Cartegnie fcvlc...@free.fr | Thu Aug
14 17:38:45 2014 +0900| [7058b549c2cfdf0b4d7241489c16a0a785ace459] | committer:
Jean-Baptiste Kempf
demux: mp4: point to atom's position of base offset is moov (fix #11746)
Not so common flags, lack of samples.
Unsure if it doesn't break something else.
(cherry picked from commit 4fe0751b76f43b9b0ac6aab34319a94e498536cd)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=7058b549c2cfdf0b4d7241489c16a0a785ace459
---
modules/demux/mp4/mp4.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index edc37d9..dc45952 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -4540,7 +4540,7 @@ static bool AddFragment( demux_t *p_demux, MP4_Box_t
*p_moox )
}
else if ( BOXDATA(p_tfhd)-i_flags MP4_TFHD_DEFAULT_BASE_IS_MOOF )
{
-i_traf_base_data_offset = p_new-p_moox-i_pos + 8;
+i_traf_base_data_offset = p_new-p_moox-i_pos /* + 8*/;
}
else
{
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: don't use a modal dialog for continuing the playback
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri
Aug 15 05:44:30 2014 +0200| [a1029e49c270d8c5519ad75d58269f45845fcdf3] |
committer: Jean-Baptiste Kempf
Qt: don't use a modal dialog for continuing the playback
Close #11705 #11703
(cherry picked from commit a3f6eeeb90422e40a2650d05be667b410aec3668)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=a1029e49c270d8c5519ad75d58269f45845fcdf3
---
modules/gui/qt4/input_manager.cpp |7 +
modules/gui/qt4/input_manager.hpp |2 ++
modules/gui/qt4/main_interface.cpp | 53
modules/gui/qt4/main_interface.hpp |8 ++
modules/gui/qt4/qt4.cpp| 11
5 files changed, 75 insertions(+), 6 deletions(-)
diff --git a/modules/gui/qt4/input_manager.cpp
b/modules/gui/qt4/input_manager.cpp
index 4ab1f58..1a04f51 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -136,12 +136,7 @@ void InputManager::setInput( input_thread_t *_p_input )
!var_GetFloat( p_input, start-time )
!var_GetFloat( p_input, stop-time ) )
{
-if( QMessageBox::question( NULL,
-_(Continue playback?),
-_(Do you want to restart the playback where left
off?),
-QMessageBox::Yes | QMessageBox::No,
QMessageBox::Yes )
-== QMessageBox::Yes )
-var_SetTime( p_input, time, (int64_t)i_time * 1000 );
+emit continuePlayback( (int64_t)i_time * 1000 );
}
}
}
diff --git a/modules/gui/qt4/input_manager.hpp
b/modules/gui/qt4/input_manager.hpp
index af66ee0..60719b8 100644
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -223,6 +223,8 @@ signals:
void titleChanged( bool );
void chapterChanged( bool );
void inputCanSeek( bool );
+/// You can continuePlayback
+void continuePlayback( int64_t );
/// Statistics are updated
void statisticsUpdated( input_item_t* );
void infoChanged( input_item_t* );
diff --git a/modules/gui/qt4/main_interface.cpp
b/modules/gui/qt4/main_interface.cpp
index f5d601e..4734749 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -60,6 +60,8 @@
#include QStackedWidget
#include QFileInfo
+#include QTimer
+
#include vlc_keys.h /* Wheel event */
#include vlc_vout_display.h /* vout_thread_t and VOUT_ events
*/
@@ -366,6 +368,56 @@ void MainInterface::reloadPrefs()
}
}
+void MainInterface::createContinueDialog( QWidget *w )
+{
+/* Create non-modal continueDialog */
+continueDialog = new QWidget( w );
+continueDialog-hide();
+QHBoxLayout *continueDialogLayout = new QHBoxLayout( continueDialog );
+continueDialogLayout-setSpacing( 0 ); continueDialogLayout-setMargin( 0
);
+
+QLabel *continueLabel = new QLabel( qtr( Do you want to restart the
playback where left off?) );
+QToolButton *cancel = new QToolButton( continueDialog );
+cancel-setAutoRaise( true );
+cancel-setText( X );
+QPushButton *ok = new QPushButton( qtr(Continue) );
+
+continueDialogLayout-addWidget(continueLabel);
+continueDialogLayout-addStretch( 1 );
+continueDialogLayout-addWidget( ok );
+continueDialogLayout-addWidget( cancel );
+
+CONNECT( cancel, clicked(), continueDialog, hide() );
+BUTTONACT(ok, continuePlayback() );
+
+CONNECT( THEMIM-getIM(), continuePlayback(int64_t), this,
showContinueDialog(int64_t) );
+
+w-layout()-addWidget( continueDialog );
+}
+
+void MainInterface::showContinueDialog( int64_t _time ) {
+int setting = var_InheritInteger( p_intf, qt-continue );
+
+if( setting == 0 )
+return;
+
+i_continueTime = _time;
+
+if( setting == 2)
+continuePlayback();
+else
+{
+continueDialog-setVisible(true);
+QTimer::singleShot(6000, continueDialog, SLOT(hide()));
+}
+}
+
+void MainInterface::continuePlayback()
+{
+var_SetTime( THEMIM-getInput(), time, i_continueTime );
+continueDialog-hide();
+}
+
void MainInterface::createMainWidget( QSettings *creationSettings )
{
/* Create the main Widget and the mainLayout */
@@ -375,6 +427,7 @@ void MainInterface::createMainWidget( QSettings
*creationSettings )
main-setContentsMargins( 0, 0, 0, 0 );
mainLayout-setSpacing( 0 ); mainLayout-setMargin( 0 );
+createContinueDialog( main );
/* */
stackCentralW = new QVLCStackedWidget( main );
diff --git a/modules/gui/qt4/main_interface.hpp
b/modules/gui/qt4/main_interface.hpp
index cea8847..e3f36a7 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -111,6 +111,7 @@ private:
void createMainWidget( QSettings* );
void
[vlc-commits] Qt: video filter helper for getting the filter type
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri
Aug 15 07:53:47 2014 +0200| [5a4627848b6e5aa9d7f5636a3056546ebdf5c30d] |
committer: Jean-Baptiste Kempf
Qt: video filter helper for getting the filter type
Ref #11613
(cherry picked from commit 78ea3f23df02fa470d0d9de50ab9306348014d2f)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5a4627848b6e5aa9d7f5636a3056546ebdf5c30d
---
modules/gui/qt4/components/extended_panels.cpp | 31 ++--
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/modules/gui/qt4/components/extended_panels.cpp
b/modules/gui/qt4/components/extended_panels.cpp
index 84d16ae..1d2f4ac 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -354,39 +354,34 @@ static void ChangeAFiltersString( struct intf_thread_t
*p_intf, const char *psz_
free( psz_string );
}
-static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char
*psz_name, bool b_add )
+static const char* GetVFilterType( struct intf_thread_t *p_intf, const char
*psz_name )
{
-char *psz_string;
-const char *psz_filter_type;
-
module_t *p_obj = module_find( psz_name );
if( !p_obj )
{
msg_Err( p_intf, Unable to find filter module \%s\., psz_name );
-return;
+return NULL;
}
if( module_provides( p_obj, video splitter ) )
-{
-psz_filter_type = video-splitter;
-}
+return video-splitter;
else if( module_provides( p_obj, video filter2 ) )
-{
-psz_filter_type = video-filter;
-}
+return video-filter;
else if( module_provides( p_obj, sub source ) )
-{
-psz_filter_type = sub-source;
-}
+return sub-source;
else if( module_provides( p_obj, sub filter ) )
-{
-psz_filter_type = sub-filter;
-}
+return sub-filter;
else
{
msg_Err( p_intf, Unknown video filter type. );
-return;
+return NULL;
}
+}
+
+static void ChangeVFiltersString( struct intf_thread_t *p_intf, const char
*psz_name, bool b_add )
+{
+char *psz_string;
+const char *psz_filter_type = GetVFilterType( p_intf, psz_name );
psz_string = ChangeFiltersString( p_intf, psz_filter_type, psz_name, b_add
);
if( !psz_string )
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: avi: remove packed attribute from vids (fix #11965)
vlc/vlc-2.2 | branch: master | Francois Cartegnie fcvlc...@free.fr | Thu Aug
14 17:37:19 2014 +0900| [4860e26f60823ba9b72289de81ae49f01e690516] | committer:
Jean-Baptiste Kempf
demux: avi: remove packed attribute from vids (fix #11965)
(cherry picked from commit cd4e7fa8269485be37ee8aaa2f3d3da0e017970c)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=4860e26f60823ba9b72289de81ae49f01e690516
---
modules/demux/avi/libavi.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/demux/avi/libavi.h b/modules/demux/avi/libavi.h
index 83f004d..d3684fd 100644
--- a/modules/demux/avi/libavi.h
+++ b/modules/demux/avi/libavi.h
@@ -122,7 +122,7 @@ typedef struct avi_chunk_strf_auds_s
WAVEFORMATEX*p_wf;
} avi_chunk_strf_auds_t;
-typedef struct ATTR_PACKED avi_chunk_strf_vids_s
+typedef struct avi_chunk_strf_vids_s
{
AVI_CHUNK_COMMON
int i_cat;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: fix the postprocessing menu
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri
Aug 15 09:26:25 2014 +0200| [f70392c3399df2001180df38643169bdcc1c34f7] |
committer: Jean-Baptiste Kempf
Qt: fix the postprocessing menu
Close #11613
(cherry picked from commit d65b41f4da915e148a42b5699962947134fcc7dd)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f70392c3399df2001180df38643169bdcc1c34f7
---
modules/gui/qt4/menus.cpp | 35 +--
modules/gui/qt4/menus.hpp |3 +++
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 0935346..15a14b9 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -50,6 +50,7 @@
#include util/qmenuview.hpp /* Simple Playlist menu */
#include components/playlist/playlist_model.hpp /* PLModel getter */
#include components/playlist/standardpanel.hpp /* PLView getter */
+#include components/extended_panels.hpp
#include QMenu
#include QMenuBar
@@ -83,6 +84,7 @@ static QActionGroup *currentGroup;
QMenu *VLCMenuBar::recentsMenu = NULL;
QMenu *VLCMenuBar::audioDeviceMenu = NULL;
+QMenu *VLCMenuBar::ppMenu = NULL;
/**
* @brief Add static entries to DP in menus
@@ -247,7 +249,8 @@ static int VideoAutoMenuBuilder( playlist_t *pl,
input_thread_t *p_input,
PUSH_VAR( crop );
PUSH_VAR( deinterlace );
PUSH_VAR( deinterlace-mode );
-PUSH_VAR( postprocess );
+
+VLCMenuBar::ppMenu-setEnabled( p_object != NULL );
if( p_object )
vlc_object_release( p_object );
@@ -684,7 +687,8 @@ QMenu *VLCMenuBar::VideoMenu( intf_thread_t *p_intf, QMenu
*current )
/* Rendering modifiers */
addActionWithSubmenu( current, deinterlace, qtr( Deinterlace ) );
addActionWithSubmenu( current, deinterlace-mode, qtr( Deinterlace
mode ) );
-addActionWithSubmenu( current, postprocess, qtr( Post processing
) );
+ppMenu = PPMenu( p_intf );
+current-addMenu( ppMenu );
current-addSeparator();
/* Other actions */
@@ -1638,3 +1642,30 @@ void VLCMenuBar::updateRecents( intf_thread_t *p_intf )
}
}
}
+
+QMenu *VLCMenuBar::PPMenu( intf_thread_t *p_intf )
+{
+int i_q = ExtVideo::getPostprocessing( p_intf );
+
+QMenu *submenu = new QMenu( Post processing );
+
+QActionGroup *actionGroup = new QActionGroup(submenu);
+QAction *action;
+
+#define ADD_PP_ACTION( text, value ) \
+action = new QAction( qtr(text), submenu ); \
+action-setData( value ); \
+action-setCheckable(true); \
+if( value == i_q ) action-setChecked( true ); \
+submenu-addAction( action ); \
+actionGroup-addAction( action );
+
+ADD_PP_ACTION( Disable, -1 );
+submenu-addSeparator();
+ADD_PP_ACTION( Lowest, 1 );
+ADD_PP_ACTION( Middle, 3 );
+ADD_PP_ACTION( Highest, 6 );
+
+CONNECT( actionGroup, triggered( QAction *), ActionsManager::getInstance(
p_intf ), PPaction( QAction * ) );
+return submenu;
+}
diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 3b39c7b..479f993 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -99,6 +99,8 @@ public:
};
Q_DECLARE_FLAGS(actionflags, actionflag)
+static QMenu *ppMenu;
+
private:
/* All main Menus */
static QMenu *FileMenu( intf_thread_t *, QWidget *, MainInterface * mi =
NULL );
@@ -133,6 +135,7 @@ private:
}
static QMenu *HelpMenu( QWidget * );
+static QMenu *PPMenu( intf_thread_t *p_intf );
/* Popups Menus */
static void PopupMenuStaticEntries( QMenu *menu );
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Win32: rename crashdump to get only 1 bug report
vlc/vlc-2.2 | branch: master | Hannes Domani ssb...@yahoo.de | Wed Aug 13
20:09:20 2014 +0200| [a5b13591e9a24ae1b74685edd8961ad40f72bea2] | committer:
Jean-Baptiste Kempf
Win32: rename crashdump to get only 1 bug report
Close #8168
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit 8b0f5764e8ecda6cebef43fdd852f37abb15cc5d)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=a5b13591e9a24ae1b74685edd8961ad40f72bea2
---
bin/winvlc.c | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/bin/winvlc.c b/bin/winvlc.c
index 02bc5b6..3209b46 100644
--- a/bin/winvlc.c
+++ b/bin/winvlc.c
@@ -207,7 +207,14 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE
hPrevInstance,
/* Crashdumps handling */
static void check_crashdump(void)
{
-FILE * fd = _wfopen ( crashdump_path, Lr, ccs=UTF-8 );
+wchar_t mv_crashdump_path[MAX_PATH];
+wcscpy (mv_crashdump_path, crashdump_path);
+wcscat (mv_crashdump_path, L.mv);
+
+if (_wrename (crashdump_path, mv_crashdump_path))
+return;
+
+FILE * fd = _wfopen ( mv_crashdump_path, Lr, ccs=UTF-8 );
if( !fd )
return;
fclose( fd );
@@ -235,7 +242,7 @@ static void check_crashdump(void)
now.wYear, now.wMonth, now.wDay, now.wHour,
now.wMinute, now.wSecond );
-if( FtpPutFile( ftp, crashdump_path, remote_file,
+if( FtpPutFile( ftp, mv_crashdump_path, remote_file,
FTP_TRANSFER_TYPE_BINARY, 0) )
MessageBox( NULL, LReport sent correctly. Thanks a lot \
for the help., LReport sent, MB_OK);
@@ -265,7 +272,7 @@ static void check_crashdump(void)
}
}
-_wremove(crashdump_path);
+_wremove(mv_crashdump_path);
}
/*
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: PostProc getter helper
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri
Aug 15 08:05:42 2014 +0200| [94c56b98fe4900cfe3ff2a0e7d254e074617f749] |
committer: Jean-Baptiste Kempf
Qt: PostProc getter helper
Ref #11613
(cherry picked from commit 36f457d0ad9bb8dabfac5a51328799c48ed33a9f)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=94c56b98fe4900cfe3ff2a0e7d254e074617f749
---
modules/gui/qt4/components/extended_panels.cpp | 12
modules/gui/qt4/components/extended_panels.hpp |1 +
2 files changed, 13 insertions(+)
diff --git a/modules/gui/qt4/components/extended_panels.cpp
b/modules/gui/qt4/components/extended_panels.cpp
index c87fcc4..4ee8eed 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -698,6 +698,18 @@ void ExtVideo::updateFilterOptions()
setFilterOption( p_intf, qtu( module ), qtu( option ), i_int, f_float,
val);
}
+int ExtVideo::getPostprocessing( struct intf_thread_t *p_intf)
+{
+char *psz_config = config_GetPsz(p_intf, video-filter);
+int i_q = -1;
+if (psz_config) {
+if (strstr(psz_config, postproc))
+i_q = config_GetInt(p_intf, postproc-q);
+free(psz_config);
+}
+return i_q;
+}
+
void ExtVideo::setPostprocessing( struct intf_thread_t *p_intf, int q)
{
const char *psz_name = postproc;
diff --git a/modules/gui/qt4/components/extended_panels.hpp
b/modules/gui/qt4/components/extended_panels.hpp
index 9659a61..b4c71ea 100644
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -47,6 +47,7 @@ class ExtVideo: public QObject
public:
ExtVideo( struct intf_thread_t *, QTabWidget * );
static void setPostprocessing( struct intf_thread_t *, int q);
+static int getPostprocessing( struct intf_thread_t *p_intf);
private:
Ui::ExtVideoWidget ui;
QSignalMapper* filterMapper;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] livehttp: fixed generated iv in index file
vlc/vlc-2.2 | branch: master | Christian Suloway csulo...@globaleagleent.com
| Thu Aug 14 17:55:35 2014 -0500| [c860dabc0a629ad4699e4f61c90e92772ff15899] |
committer: Jean-Baptiste Kempf
livehttp: fixed generated iv in index file
Removed extra shift when copying generated iv for output to index file tag
Signed-off-by: Rafaël Carré fun...@videolan.org
(cherry picked from commit 6d7595d821e693391417531cf3c846f2f368b831)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c860dabc0a629ad4699e4f61c90e92772ff15899
---
modules/access_output/livehttp.c |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/modules/access_output/livehttp.c b/modules/access_output/livehttp.c
index acf0991..a1b6131 100644
--- a/modules/access_output/livehttp.c
+++ b/modules/access_output/livehttp.c
@@ -614,13 +614,14 @@ static int updateIndexAndDel( sout_access_out_t
*p_access, sout_access_out_sys_t
psz_current_uri = strdup( segment-psz_key_uri );
if( p_sys-b_generate_iv )
{
-unsigned long long iv_hi = 0, iv_lo = 0;
-for( unsigned short i = 0; i 8; i++ )
+unsigned long long iv_hi = segment-aes_ivs[0];
+unsigned long long iv_lo = segment-aes_ivs[8];
+for( unsigned short i = 1; i 8; i++ )
{
-iv_hi |= segment-aes_ivs[i] 0xff;
iv_hi = 8;
-iv_lo |= segment-aes_ivs[8+i] 0xff;
+iv_hi |= segment-aes_ivs[i] 0xff;
iv_lo = 8;
+iv_lo |= segment-aes_ivs[8+i] 0xff;
}
ret = fprintf( fp,
#EXT-X-KEY:METHOD=AES-128,URI=\%s\,IV=0X%16.16llx%16.16llx\n,
segment-psz_key_uri, iv_hi, iv_lo );
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: PostProc setter helper
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri
Aug 15 07:53:57 2014 +0200| [fa439d80472d4a4b758d58d9cd8701aa776ee9bb] |
committer: Jean-Baptiste Kempf
Qt: PostProc setter helper
Ref #11613
(cherry picked from commit cca1c1efc30abed41eba0f3b3091735d3cd2e46d)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=fa439d80472d4a4b758d58d9cd8701aa776ee9bb
---
modules/gui/qt4/components/extended_panels.cpp | 15 +++
modules/gui/qt4/components/extended_panels.hpp |1 +
2 files changed, 16 insertions(+)
diff --git a/modules/gui/qt4/components/extended_panels.cpp
b/modules/gui/qt4/components/extended_panels.cpp
index c579732..c87fcc4 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -698,6 +698,21 @@ void ExtVideo::updateFilterOptions()
setFilterOption( p_intf, qtu( module ), qtu( option ), i_int, f_float,
val);
}
+void ExtVideo::setPostprocessing( struct intf_thread_t *p_intf, int q)
+{
+const char *psz_name = postproc;
+
+if( q == -1 )
+{
+ChangeVFiltersString( p_intf, psz_name, false );
+}
+else
+{
+ChangeVFiltersString( p_intf, psz_name, false );
+setFilterOption( p_intf, postproc, postproc-q, q, -1, QString() );
+}
+}
+
/**
* v4l2 controls
**/
diff --git a/modules/gui/qt4/components/extended_panels.hpp
b/modules/gui/qt4/components/extended_panels.hpp
index 2e20830..9659a61 100644
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -46,6 +46,7 @@ class ExtVideo: public QObject
friend class ExtendedDialog;
public:
ExtVideo( struct intf_thread_t *, QTabWidget * );
+static void setPostprocessing( struct intf_thread_t *, int q);
private:
Ui::ExtVideoWidget ui;
QSignalMapper* filterMapper;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: epg: fix update signal
vlc/vlc-2.2 | branch: master | Francois Cartegnie fcvlc...@free.fr | Fri Aug 15 18:30:32 2014 +0900| [39daee31943410459ac564cb36081dd7c06de3dc] | committer: Jean-Baptiste Kempf Qt: epg: fix update signal (cherry picked from commit 1d0f949a8202aa34e8f7f7f7ac2992c9fdd602f2) Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=39daee31943410459ac564cb36081dd7c06de3dc --- modules/gui/qt4/dialogs/epg.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/qt4/dialogs/epg.cpp b/modules/gui/qt4/dialogs/epg.cpp index bedd3da..bf2c1fb 100644 --- a/modules/gui/qt4/dialogs/epg.cpp +++ b/modules/gui/qt4/dialogs/epg.cpp @@ -75,7 +75,7 @@ EpgDialog::EpgDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf ) CONNECT( epg, itemSelectionChanged( EPGItem *), this, displayEvent( EPGItem *) ); CONNECT( THEMIM-getIM(), epgChanged(), this, updateInfos() ); -CONNECT( THEMIM, inputChanged( input_thread_t * ), this, updateInfos() ); +CONNECT( THEMIM, inputChanged( ), this, updateInfos() ); QDialogButtonBox *buttonsBox = new QDialogButtonBox( this ); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: helpers for setting video filter values
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri
Aug 15 07:18:27 2014 +0200| [1961ae181dbcd3f69de427e9f970343251ac16ca] |
committer: Jean-Baptiste Kempf
Qt: helpers for setting video filter values
This is mostly splitting Qt and core code
Ref #11613
(cherry picked from commit c803336b8b6c859bf529dbc944668e63b30e2828)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=1961ae181dbcd3f69de427e9f970343251ac16ca
---
modules/gui/qt4/components/extended_panels.cpp | 127 +---
modules/gui/qt4/components/extended_panels.hpp |2 +
2 files changed, 73 insertions(+), 56 deletions(-)
diff --git a/modules/gui/qt4/components/extended_panels.cpp
b/modules/gui/qt4/components/extended_panels.cpp
index 1d2f4ac..c579732 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -583,106 +583,121 @@ void ExtVideo::setWidgetValue( QObject *widget )
i_type );
}
-void ExtVideo::updateFilterOptions()
+void ExtVideo::setFilterOption( struct intf_thread_t *p_intf, const char
*psz_module, const char *psz_option,
+int i_int, double f_float, QString val )
{
-QString module = ModuleFromWidgetName( sender()-parent() );
-//msg_Dbg( p_intf, Module name: %s, qtu( module ) );
-QString option = OptionFromWidgetName( sender() );
-//msg_Dbg( p_intf, Option name: %s, qtu( option ) );
-
-vlc_object_t *p_obj = ( vlc_object_t * )
-vlc_object_find_name( p_intf-p_libvlc, qtu( module ) );
+vlc_object_t *p_obj = ( vlc_object_t * )vlc_object_find_name(
p_intf-p_libvlc, psz_module );
int i_type;
bool b_is_command;
+
if( !p_obj )
{
-msg_Warn( p_intf, Module %s not found. You'll need to restart the
filter to take the change into account., qtu( module ) );
-i_type = config_GetType( p_intf, qtu( option ) );
+msg_Warn( p_intf, Module %s not found. You'll need to restart the
filter to take the change into account., psz_module );
+i_type = config_GetType( p_intf, psz_option );
b_is_command = false;
}
else
{
-i_type = var_Type( p_obj, qtu( option ) );
+i_type = var_Type( p_obj, psz_option );
if( i_type == 0 )
-i_type = config_GetType( p_intf, qtu( option ) );
+i_type = config_GetType( p_intf, psz_option );
b_is_command = ( i_type VLC_VAR_ISCOMMAND );
}
-/* Try to cast to all the widgets we're likely to encounter. Only
- * one of the casts is expected to work. */
-QSlider*slider= qobject_castQSlider* ( sender() );
-QCheckBox *checkbox = qobject_castQCheckBox* ( sender() );
-QSpinBox *spinbox = qobject_castQSpinBox* ( sender() );
-QDoubleSpinBox *doublespinbox = qobject_castQDoubleSpinBox*( sender() );
-VLCQDial *dial = qobject_castVLCQDial* ( sender() );
-QLineEdit *lineedit = qobject_castQLineEdit* ( sender() );
-QComboBox *combobox = qobject_castQComboBox* ( sender() );
-
i_type = VLC_VAR_CLASS;
if( i_type == VLC_VAR_INTEGER || i_type == VLC_VAR_BOOL )
{
-int i_int = 0;
-if( slider )i_int = slider-value();
-else if( checkbox ) i_int = checkbox-checkState() == Qt::Checked;
-else if( spinbox ) i_int = spinbox-value();
-else if( dial ) i_int = ( 540-dial-value() )%360;
-else if( lineedit ) i_int = lineedit-text().toInt( NULL,16 );
-else if( combobox ) i_int = combobox-itemData(
combobox-currentIndex() ).toInt();
-else msg_Warn( p_intf, Could not find the correct Integer widget );
-config_PutInt( p_intf, qtu( option ), i_int );
+if( i_int == -1 )
+msg_Warn( p_intf, Could not find the correct Integer widget );
+config_PutInt( p_intf, psz_option, i_int );
if( b_is_command )
{
if( i_type == VLC_VAR_INTEGER )
-var_SetInteger( p_obj, qtu( option ), i_int );
+var_SetInteger( p_obj, psz_option, i_int );
else
-var_SetBool( p_obj, qtu( option ), i_int );
+var_SetBool( p_obj, psz_option, i_int );
}
}
else if( i_type == VLC_VAR_FLOAT )
{
-double f_float = 0;
-if( slider ) f_float = ( double )slider-value()
- / ( double )slider-tickInterval();
/* hack alert! */
-else if( doublespinbox ) f_float = doublespinbox-value();
-else if( dial ) f_float = (540 - dial-value()) % 360;
-else if( lineedit ) f_float = lineedit-text().toDouble();
-else msg_Warn( p_intf, Could not find the correct Float widget );
-config_PutFloat( p_intf, qtu( option ), f_float );
+if( f_float == -1 )
+
[vlc-commits] Qt: create a AM::PPAction
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri
Aug 15 09:25:22 2014 +0200| [ba7ed3b867e960554f8e19db28fefc91e8a0c65c] |
committer: Jean-Baptiste Kempf
Qt: create a AM::PPAction
Ref #11613
(cherry picked from commit 004213d0606e9590eb9454dedf8c0f4715e55dd0)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=ba7ed3b867e960554f8e19db28fefc91e8a0c65c
---
modules/gui/qt4/actions_manager.cpp |9 +
modules/gui/qt4/actions_manager.hpp |3 +++
2 files changed, 12 insertions(+)
diff --git a/modules/gui/qt4/actions_manager.cpp
b/modules/gui/qt4/actions_manager.cpp
index 8b79da6..eff40d9 100644
--- a/modules/gui/qt4/actions_manager.cpp
+++ b/modules/gui/qt4/actions_manager.cpp
@@ -34,6 +34,7 @@
#include input_manager.hpp /* THEMIM */
#include main_interface.hpp/* Show playlist */
#include components/controller.hpp /* Toggle FSC controller width */
+#include components/extended_panels.hpp
ActionsManager::ActionsManager( intf_thread_t * _p_i )
{
@@ -201,3 +202,11 @@ void ActionsManager::skipBackward()
THEMIM-getIM()-jumpBwd();
}
+void ActionsManager::PPaction( QAction *a )
+{
+int i_q = -1;
+if( a != NULL )
+i_q = a-data().toInt();
+
+ExtVideo::setPostprocessing( p_intf, i_q );
+}
diff --git a/modules/gui/qt4/actions_manager.hpp
b/modules/gui/qt4/actions_manager.hpp
index ad678c1..543f10a 100644
--- a/modules/gui/qt4/actions_manager.hpp
+++ b/modules/gui/qt4/actions_manager.hpp
@@ -32,6 +32,8 @@
#include util/singleton.hpp
#include QObject
+class QAction;
+
typedef enum actionType_e
{
PLAY_ACTION,
@@ -81,6 +83,7 @@ public slots:
void record();
void skipForward();
void skipBackward();
+void PPaction( QAction * );
protected slots:
void fullscreen();
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] media_player: do not wait for input to stop when pausing (fixes #11767)
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Fri Aug 15 21:47:44 2014 +0300| [1e68f58eb16f1d6b6bc61bfdf5748243968e0608] | committer: Rémi Denis-Courmont media_player: do not wait for input to stop when pausing (fixes #11767) This lead to a deadlock when attempting to pause an input that did not support pausing. http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e68f58eb16f1d6b6bc61bfdf5748243968e0608 --- lib/media_player.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/media_player.c b/lib/media_player.c index 7201a78..c2bb7c2 100644 --- a/lib/media_player.c +++ b/lib/media_player.c @@ -903,7 +903,7 @@ void libvlc_media_player_set_pause( libvlc_media_player_t *p_mi, int paused ) if( libvlc_media_player_can_pause( p_mi ) ) input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S ); else -libvlc_media_player_stop( p_mi ); +input_Stop( p_input_thread, true ); } } else ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] media_player: do not wait for input to stop when pausing (fixes #11767)
vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont r...@remlab.net | Fri Aug 15 21:47:44 2014 +0300| [e2a4b90f4bf99498cb6144a8be6c85b822a4b3a3] | committer: Rémi Denis-Courmont media_player: do not wait for input to stop when pausing (fixes #11767) This lead to a deadlock when attempting to pause an input that did not support pausing. (cherry picked from commit 1e68f58eb16f1d6b6bc61bfdf5748243968e0608) http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e2a4b90f4bf99498cb6144a8be6c85b822a4b3a3 --- lib/media_player.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/media_player.c b/lib/media_player.c index b31a832..1a72207 100644 --- a/lib/media_player.c +++ b/lib/media_player.c @@ -782,7 +782,7 @@ void libvlc_media_player_set_pause( libvlc_media_player_t *p_mi, int paused ) if( libvlc_media_player_can_pause( p_mi ) ) input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S ); else -libvlc_media_player_stop( p_mi ); +input_Stop( p_input_thread, true ); } } else ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: ncurses: configure doesn't understand --datarootdir
vlc/vlc-2.2 | branch: master | Rafaël Carré fun...@videolan.org | Wed Aug 6 16:41:06 2014 +0200| [675da113afb699ba6d13d17ffd5ab2c91e0d031f] | committer: Jean-Baptiste Kempf contrib: ncurses: configure doesn't understand --datarootdir (cherry picked from commit 4568719e6018e9633d9cdb263bb67c03d18910e3) Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=675da113afb699ba6d13d17ffd5ab2c91e0d031f --- contrib/src/ncurses/rules.mak |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/ncurses/rules.mak b/contrib/src/ncurses/rules.mak index aa60b91..882e726 100644 --- a/contrib/src/ncurses/rules.mak +++ b/contrib/src/ncurses/rules.mak @@ -21,7 +21,7 @@ ncurses: ncurses-$(NCURSES_VERSION).tar.gz .sum-ncurses $(MOVE) .ncurses: ncurses - cd $ $(HOSTVARS) ./configure $(HOSTCONF) --without-debug --enable-widec --without-develop --without-shared --with-terminfo-dirs=/usr/share/terminfo --enable-pc-files + cd $ $(HOSTVARS) ./configure $(patsubst --datarootdir=%,,$(HOSTCONF)) --without-debug --enable-widec --without-develop --without-shared --with-terminfo-dirs=/usr/share/terminfo --enable-pc-files cd $/ncurses make -j1 make install cd $/include make -j1 make install cd $/misc make pc-files mkdir -p $(PREFIX)/lib/pkgconfig cp ncursesw.pc $(PREFIX)/lib/pkgconfig ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: ncurses: explicitly set PKG_CONFIG_LIBDIR
vlc/vlc-2.2 | branch: master | Sean McGovern gsean...@gmail.com | Fri Aug 8 13:35:01 2014 -0400| [09fc49ca352c1c2505625cd923d87a6e8b2ab11b] | committer: Jean-Baptiste Kempf contrib: ncurses: explicitly set PKG_CONFIG_LIBDIR ncurses' heavily-modified autoconfigury expects this to be present. Signed-off-by: Rafaël Carré fun...@videolan.org (cherry picked from commit 05ceb797c3802add411249d7f0f0f9a257a0) Signed-off-by: Jean-Baptiste Kempf j...@videolan.org http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=09fc49ca352c1c2505625cd923d87a6e8b2ab11b --- contrib/src/ncurses/rules.mak |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/src/ncurses/rules.mak b/contrib/src/ncurses/rules.mak index 882e726..92b3e77 100644 --- a/contrib/src/ncurses/rules.mak +++ b/contrib/src/ncurses/rules.mak @@ -21,8 +21,8 @@ ncurses: ncurses-$(NCURSES_VERSION).tar.gz .sum-ncurses $(MOVE) .ncurses: ncurses - cd $ $(HOSTVARS) ./configure $(patsubst --datarootdir=%,,$(HOSTCONF)) --without-debug --enable-widec --without-develop --without-shared --with-terminfo-dirs=/usr/share/terminfo --enable-pc-files + cd $ mkdir -p $(PREFIX)/lib/pkgconfig $(HOSTVARS) PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig ./configure $(patsubst --datarootdir=%,,$(HOSTCONF)) --without-debug --enable-widec --without-develop --without-shared --with-terminfo-dirs=/usr/share/terminfo --with-pkg-config=yes --enable-pc-files cd $/ncurses make -j1 make install cd $/include make -j1 make install - cd $/misc make pc-files mkdir -p $(PREFIX)/lib/pkgconfig cp ncursesw.pc $(PREFIX)/lib/pkgconfig + cd $/misc make pc-files cp ncursesw.pc $(PREFIX)/lib/pkgconfig touch $@ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Remove vlc_input.h from vlc_playlist.h
vlc | branch: master | Rémi Denis-Courmont r...@remlab.net | Fri Aug 15
23:00:13 2014 +0300| [5adb3308b8f818c6175c49aa91c9617c9d85b70c] | committer:
Rémi Denis-Courmont
Remove vlc_input.h from vlc_playlist.h
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5adb3308b8f818c6175c49aa91c9617c9d85b70c
---
include/vlc_playlist.h|1 -
modules/control/dbus/dbus.c |1 +
modules/control/dbus/dbus_player.c|1 +
modules/control/dbus/dbus_tracklist.c |1 +
modules/control/gestures.c|1 +
modules/control/motion.c |1 +
modules/control/rc.c |8
modules/control/win_msg.c |1 +
modules/gui/qt4/components/playlist/playlist_item.cpp |1 +
modules/gui/qt4/components/playlist/selector.hpp |2 ++
modules/gui/qt4/components/playlist/sorting.h |3 +++
modules/gui/qt4/components/playlist/views.cpp |2 +-
modules/gui/qt4/dialogs/messages.cpp |7 +--
modules/gui/qt4/recents.cpp |2 ++
modules/gui/skins2/commands/cmd_quit.cpp |2 +-
modules/gui/skins2/commands/cmd_vars.hpp |1 +
modules/gui/skins2/vars/playtree.cpp |1 +
modules/misc/audioscrobbler.c |1 +
18 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 49dcd15..2c64a7c 100644
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -28,7 +28,6 @@
extern C {
# endif
-#include vlc_input.h
#include vlc_events.h
TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t)
diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index bbf7f7b..b3da27b 100644
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -57,6 +57,7 @@
#include vlc_plugin.h
#include vlc_interface.h
#include vlc_playlist.h
+#include vlc_input.h
#include vlc_meta.h
#include vlc_mtime.h
#include vlc_fs.h
diff --git a/modules/control/dbus/dbus_player.c
b/modules/control/dbus/dbus_player.c
index 0906934..494d9d5 100644
--- a/modules/control/dbus/dbus_player.c
+++ b/modules/control/dbus/dbus_player.c
@@ -32,6 +32,7 @@
#include vlc_common.h
#include vlc_playlist.h
+#include vlc_input.h
#include vlc_interface.h
#include math.h
diff --git a/modules/control/dbus/dbus_tracklist.c
b/modules/control/dbus/dbus_tracklist.c
index 577e231..8c71250 100644
--- a/modules/control/dbus/dbus_tracklist.c
+++ b/modules/control/dbus/dbus_tracklist.c
@@ -32,6 +32,7 @@
#include vlc_common.h
#include vlc_playlist.h
+#include vlc_input.h
#include assert.h
diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index 53e440c..d526971 100644
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@ -34,6 +34,7 @@
#include vlc_interface.h
#include vlc_vout.h
#include vlc_playlist.h
+#include vlc_input.h
#include assert.h
/*
diff --git a/modules/control/motion.c b/modules/control/motion.c
index 8d74e89..80196ad 100644
--- a/modules/control/motion.c
+++ b/modules/control/motion.c
@@ -37,6 +37,7 @@
#include vlc_plugin.h
#include vlc_interface.h
#include vlc_playlist.h
+#include vlc_input.h
#include vlc_vout.h
#include motionlib.h
diff --git a/modules/control/rc.c b/modules/control/rc.c
index 8e5a162..0af8619 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -30,15 +30,15 @@
# include config.h
#endif
-#include vlc_common.h
-#include vlc_plugin.h
-
#include errno.h /* ENOMEM */
#include signal.h
#include assert.h
#include math.h
+#include vlc_common.h
+#include vlc_plugin.h
#include vlc_interface.h
+#include vlc_input.h
#include vlc_aout.h
#include vlc_vout.h
#include vlc_playlist.h
@@ -47,9 +47,9 @@
#include sys/types.h
#include unistd.h
+
#include vlc_network.h
#include vlc_url.h
-
#include vlc_charset.h
#if defined(PF_UNIX) !defined(PF_LOCAL)
diff --git a/modules/control/win_msg.c b/modules/control/win_msg.c
index 167ecac..32c890c 100644
--- a/modules/control/win_msg.c
+++ b/modules/control/win_msg.c
@@ -29,6 +29,7 @@
#include vlc_plugin.h
#include vlc_interface.h
#include vlc_playlist.h
+#include vlc_input.h
#include vlc_url.h // FIXME: move URL generation to calling process
#include windows.h
diff --git a/modules/gui/qt4/components/playlist/playlist_item.cpp
b/modules/gui/qt4/components/playlist/playlist_item.cpp
index 0fbbcba..1a130aa 100644
--- a/modules/gui/qt4/components/playlist/playlist_item.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.cpp
@@ -30,6 +30,7 @@
#include qt4.hpp
#include playlist_item.hpp
+#include vlc_input_item.h
[vlc-commits] l10n: Persian update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 15:48:24 2014 -0400| [f6eb72286b7c80bfa3eaacac2d753456c4834db1] | committer: Christoph Miebach l10n: Persian update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f6eb72286b7c80bfa3eaacac2d753456c4834db1 --- po/fa.po | 1024 ++ 1 file changed, 503 insertions(+), 521 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=f6eb72286b7c80bfa3eaacac2d753456c4834db1 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Modern Greek update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 15:41:07 2014 -0400| [83ad72e7083acfcac5eb90dfb8183acdf0972e2b] | committer: Christoph Miebach l10n: Modern Greek update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=83ad72e7083acfcac5eb90dfb8183acdf0972e2b --- po/el.po | 1229 -- 1 file changed, 557 insertions(+), 672 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=83ad72e7083acfcac5eb90dfb8183acdf0972e2b ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Kabyle update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 15:58:58 2014 -0400| [08454d0f60485de27272f856c027313c4a222b62] | committer: Christoph Miebach l10n: Kabyle update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=08454d0f60485de27272f856c027313c4a222b62 --- po/kab.po | 163 ++--- 1 file changed, 79 insertions(+), 84 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=08454d0f60485de27272f856c027313c4a222b62 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Welsh update
vlc/vlc-2.2 | branch: master | Aled Powell a...@aledpowell.com | Fri Aug 15 15:31:43 2014 -0400| [222f8ac9d09153f9f26d8a2ac89c00b12bf78f36] | committer: Christoph Miebach l10n: Welsh update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=222f8ac9d09153f9f26d8a2ac89c00b12bf78f36 --- po/cy.po | 696 +- 1 file changed, 277 insertions(+), 419 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=222f8ac9d09153f9f26d8a2ac89c00b12bf78f36 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Bosnian update
vlc/vlc-2.2 | branch: master | Adnan Memija sream...@live.com | Fri Aug 15 15:27:14 2014 -0400| [bbb2cca520708b723c0e1d3d3cffca661323ee99] | committer: Christoph Miebach l10n: Bosnian update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=bbb2cca520708b723c0e1d3d3cffca661323ee99 --- po/bs.po | 895 +++--- 1 file changed, 388 insertions(+), 507 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=bbb2cca520708b723c0e1d3d3cffca661323ee99 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Italian update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 15:57:27 2014 -0400| [cfad9a8e221ef68b86264d74b2120bf7b1de56e8] | committer: Christoph Miebach l10n: Italian update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=cfad9a8e221ef68b86264d74b2120bf7b1de56e8 --- po/it.po | 1621 +++--- 1 file changed, 806 insertions(+), 815 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=cfad9a8e221ef68b86264d74b2120bf7b1de56e8 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Danish update
vlc/vlc-2.2 | branch: master | Aputsiaĸ Niels Janussen a...@isit.gl | Fri Aug 15 15:32:56 2014 -0400| [ead7377efd350587c9da0966272daba5bb6c48bb] | committer: Christoph Miebach l10n: Danish update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=ead7377efd350587c9da0966272daba5bb6c48bb --- po/da.po | 1560 ++ 1 file changed, 760 insertions(+), 800 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=ead7377efd350587c9da0966272daba5bb6c48bb ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Spanish (Mexico) update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 15:42:13 2014 -0400| [b579c34b4ba0bfa296f95fba953ec96d402cff14] | committer: Christoph Miebach l10n: Spanish (Mexico) update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=b579c34b4ba0bfa296f95fba953ec96d402cff14 --- po/es_MX.po | 1056 --- 1 file changed, 425 insertions(+), 631 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=b579c34b4ba0bfa296f95fba953ec96d402cff14 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Spanish update
vlc/vlc-2.2 | branch: master | David González pico@gmail.com | Fri Aug 15 15:43:39 2014 -0400| [bd8b635b5b23929bdb14f4e7aad58d909bed26cd] | committer: Christoph Miebach l10n: Spanish update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=bd8b635b5b23929bdb14f4e7aad58d909bed26cd --- po/es.po | 1408 +- 1 file changed, 658 insertions(+), 750 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=bd8b635b5b23929bdb14f4e7aad58d909bed26cd ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Estonian update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 15:45:50 2014 -0400| [a376d4081b6143007cdcefd2f4425ff6afb488cb] | committer: Christoph Miebach l10n: Estonian update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=a376d4081b6143007cdcefd2f4425ff6afb488cb --- po/et.po | 1097 -- 1 file changed, 486 insertions(+), 611 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=a376d4081b6143007cdcefd2f4425ff6afb488cb ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Japanese update
vlc/vlc-2.2 | branch: master | Fumio Nakayama fumio@gmail.com | Fri Aug 15 15:58:19 2014 -0400| [ca14e41d84ed95d2055e0d12ca55259e8016b37f] | committer: Christoph Miebach l10n: Japanese update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=ca14e41d84ed95d2055e0d12ca55259e8016b37f --- po/ja.po | 1336 +- 1 file changed, 629 insertions(+), 707 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=ca14e41d84ed95d2055e0d12ca55259e8016b37f ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: French update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 15:52:11 2014 -0400| [b1a3e8ddb5e41818eb814037a8b97965945c2b95] | committer: Christoph Miebach l10n: French update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=b1a3e8ddb5e41818eb814037a8b97965945c2b95 --- po/fr.po | 1142 -- 1 file changed, 510 insertions(+), 632 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=b1a3e8ddb5e41818eb814037a8b97965945c2b95 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: German update
vlc/vlc-2.2 | branch: master | Michał Trzebiatowski hippie_1...@hotmail.com | Fri Aug 15 15:40:11 2014 -0400| [877eb8699260aaf809bbd4bf0e43640bddb3c563] | committer: Christoph Miebach l10n: German update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=877eb8699260aaf809bbd4bf0e43640bddb3c563 --- po/de.po | 1568 ++ 1 file changed, 747 insertions(+), 821 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=877eb8699260aaf809bbd4bf0e43640bddb3c563 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Brazilian Portuguese update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 16:09:42 2014 -0400| [cbb2804c9359b384945772911169506bba3166d3] | committer: Christoph Miebach l10n: Brazilian Portuguese update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=cbb2804c9359b384945772911169506bba3166d3 --- po/pt_BR.po | 1009 +-- 1 file changed, 428 insertions(+), 581 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=cbb2804c9359b384945772911169506bba3166d3 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Norwegian Bokmål update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 16:03:23 2014 -0400| [c6c5b9bcdfd21394401b3e3d644839560add469a] | committer: Christoph Miebach l10n: Norwegian Bokmål update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c6c5b9bcdfd21394401b3e3d644839560add469a --- po/nb.po | 1231 +- 1 file changed, 570 insertions(+), 661 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=c6c5b9bcdfd21394401b3e3d644839560add469a ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Russian update
vlc/vlc-2.2 | branch: master | Alexander Lakhin exclus...@gmail.com | Fri Aug 15 16:14:42 2014 -0400| [062051c564ab28444837361b87fc5d2fc21b9def] | committer: Christoph Miebach l10n: Russian update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=062051c564ab28444837361b87fc5d2fc21b9def --- po/ru.po | 1918 ++ 1 file changed, 922 insertions(+), 996 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=062051c564ab28444837361b87fc5d2fc21b9def ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Malay update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 16:01:51 2014 -0400| [bc1851fbf0e75b0d0286803a936587ca24c3a7e3] | committer: Christoph Miebach l10n: Malay update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=bc1851fbf0e75b0d0286803a936587ca24c3a7e3 --- po/ms.po | 1388 ++ 1 file changed, 661 insertions(+), 727 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=bc1851fbf0e75b0d0286803a936587ca24c3a7e3 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Nepali update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 16:04:08 2014 -0400| [825f1322e3234e5b3455efd13aa4dbff2c12bdb7] | committer: Christoph Miebach l10n: Nepali update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=825f1322e3234e5b3455efd13aa4dbff2c12bdb7 --- po/ne.po | 536 +++--- 1 file changed, 199 insertions(+), 337 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=825f1322e3234e5b3455efd13aa4dbff2c12bdb7 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Romanian update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 16:13:54 2014 -0400| [8162ed96c84a905b869c177f0c8312b01432535e] | committer: Christoph Miebach l10n: Romanian update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=8162ed96c84a905b869c177f0c8312b01432535e --- po/ro.po | 819 ++ 1 file changed, 341 insertions(+), 478 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=8162ed96c84a905b869c177f0c8312b01432535e ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Hebrew update
vlc/vlc-2.2 | branch: master | Yaron Shahrabani sh.ya...@gmail.com | Fri Aug 15 15:55:11 2014 -0400| [9382bddaf99144314a2b82fa6c71e652faf2199e] | committer: Christoph Miebach l10n: Hebrew update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=9382bddaf99144314a2b82fa6c71e652faf2199e --- po/he.po | 1816 +- 1 file changed, 857 insertions(+), 959 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=9382bddaf99144314a2b82fa6c71e652faf2199e ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Scottish Gaelic update
vlc/vlc-2.2 | branch: master | Michael Bauer f...@akerbeltz.org | Fri Aug 15 15:53:11 2014 -0400| [828f4a1d18f160dba6d71732601cca6493608b35] | committer: Christoph Miebach l10n: Scottish Gaelic update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=828f4a1d18f160dba6d71732601cca6493608b35 --- po/gd.po | 586 +- 1 file changed, 236 insertions(+), 350 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=828f4a1d18f160dba6d71732601cca6493608b35 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Dutch update
vlc/vlc-2.2 | branch: master | Thomas De Rocker thomasderoc...@hotmail.com | Fri Aug 15 16:05:29 2014 -0400| [401a907135ff924fbde26db00b9333a37fe84eeb] | committer: Christoph Miebach l10n: Dutch update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=401a907135ff924fbde26db00b9333a37fe84eeb --- po/nl.po | 2128 ++ 1 file changed, 1033 insertions(+), 1095 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=401a907135ff924fbde26db00b9333a37fe84eeb ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Slovak update
vlc/vlc-2.2 | branch: master | Marián Hikaník mhika...@users.sourceforge.net | Fri Aug 15 16:15:29 2014 -0400| [58f1addea0a05ed7c5557b8f533785d4c7ebf4be] | committer: Christoph Miebach l10n: Slovak update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=58f1addea0a05ed7c5557b8f533785d4c7ebf4be --- po/sk.po | 1842 ++ 1 file changed, 883 insertions(+), 959 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=58f1addea0a05ed7c5557b8f533785d4c7ebf4be ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Arabic update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 15:21:04 2014 -0400| [ef0b9f2bf133e9beea259c1712d75d3b295f] | committer: Christoph Miebach l10n: Arabic update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=ef0b9f2bf133e9beea259c1712d75d3b295f --- po/ar.po | 864 ++ 1 file changed, 359 insertions(+), 505 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=ef0b9f2bf133e9beea259c1712d75d3b295f ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Polish update
vlc/vlc-2.2 | branch: master | Michał Trzebiatowski hippie_1...@hotmail.com | Fri Aug 15 16:08:45 2014 -0400| [b1e2ee62231a468127166db017c9dc3fe9280b55] | committer: Christoph Miebach l10n: Polish update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=b1e2ee62231a468127166db017c9dc3fe9280b55 --- po/pl.po | 1541 ++ 1 file changed, 733 insertions(+), 808 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=b1e2ee62231a468127166db017c9dc3fe9280b55 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Korean update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 16:00:17 2014 -0400| [0fabde7a4adb968d83dad753254e8f28bfe39253] | committer: Christoph Miebach l10n: Korean update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=0fabde7a4adb968d83dad753254e8f28bfe39253 --- po/ko.po | 1331 +- 1 file changed, 620 insertions(+), 711 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=0fabde7a4adb968d83dad753254e8f28bfe39253 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Slovenian update
vlc/vlc-2.2 | branch: master | Martin Srebotnjak mi...@filmsi.net | Fri Aug 15 16:16:48 2014 -0400| [5ad9f91deda7bb5888f126d3d4fdc8b73dd4a64d] | committer: Christoph Miebach l10n: Slovenian update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5ad9f91deda7bb5888f126d3d4fdc8b73dd4a64d --- po/sl.po | 938 ++ 1 file changed, 396 insertions(+), 542 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=5ad9f91deda7bb5888f126d3d4fdc8b73dd4a64d ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Serbian update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 16:19:25 2014 -0400| [f5b24057d762fc98050d803952cf3068728d1cec] | committer: Christoph Miebach l10n: Serbian update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f5b24057d762fc98050d803952cf3068728d1cec --- po/sr.po | 900 +++--- 1 file changed, 393 insertions(+), 507 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=f5b24057d762fc98050d803952cf3068728d1cec ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Traditional Chinese update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 16:46:06 2014 -0400| [5971f90a1d041db9155c04a5d1026a76dfef7526] | committer: Christoph Miebach l10n: Traditional Chinese update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5971f90a1d041db9155c04a5d1026a76dfef7526 --- po/zh_TW.po | 771 --- 1 file changed, 311 insertions(+), 460 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=5971f90a1d041db9155c04a5d1026a76dfef7526 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Simplified Chinese update
vlc/vlc-2.2 | branch: master | Dean Lee xslid...@gmail.com | Fri Aug 15 16:44:34 2014 -0400| [7bf58fbddb0eeb6ed705b22f668ef654c7039bae] | committer: Christoph Miebach l10n: Simplified Chinese update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=7bf58fbddb0eeb6ed705b22f668ef654c7039bae --- po/zh_CN.po | 2111 --- 1 file changed, 1000 insertions(+), deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=7bf58fbddb0eeb6ed705b22f668ef654c7039bae ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Turkish update
vlc/vlc-2.2 | branch: master | Kaya Zeren kayaze...@gmail.com | Fri Aug 15 16:34:11 2014 -0400| [52cbaf97e92cbbe40c2e5e808cdbde59edf6ace8] | committer: Christoph Miebach l10n: Turkish update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=52cbaf97e92cbbe40c2e5e808cdbde59edf6ace8 --- po/tr.po | 7824 +++--- 1 file changed, 3921 insertions(+), 3903 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=52cbaf97e92cbbe40c2e5e808cdbde59edf6ace8 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Vietnamese update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 16:43:34 2014 -0400| [c59defcce5d3fb963af756d313392e9e8a6b3e8a] | committer: Christoph Miebach l10n: Vietnamese update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c59defcce5d3fb963af756d313392e9e8a6b3e8a --- po/vi.po | 938 ++ 1 file changed, 391 insertions(+), 547 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=c59defcce5d3fb963af756d313392e9e8a6b3e8a ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Ukrainian update
vlc/vlc-2.2 | branch: master | Andriy Bandura andriykopanyt...@gmail.com | Fri Aug 15 16:42:11 2014 -0400| [210a98b67b9027ab2dc627b3e5ea385bee0853f8] | committer: Christoph Miebach l10n: Ukrainian update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=210a98b67b9027ab2dc627b3e5ea385bee0853f8 --- po/uk.po |13639 ++ 1 file changed, 2071 insertions(+), 11568 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=210a98b67b9027ab2dc627b3e5ea385bee0853f8 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Bengali update
vlc/vlc-2.2 | branch: master | VideoLAN video...@videolan.org | Fri Aug 15 16:50:06 2014 -0400| [2cffbca91bb3948927537efb67e105a265c28fb0] | committer: Christoph Miebach l10n: Bengali update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2cffbca91bb3948927537efb67e105a265c28fb0 --- po/bn.po | 1895 +- 1 file changed, 879 insertions(+), 1016 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=2cffbca91bb3948927537efb67e105a265c28fb0 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Punjabi update
vlc/vlc-2.2 | branch: master | Amanpreet Singh Alam apb...@gmail.com | Fri Aug 15 16:06:18 2014 -0400| [20126e536a4e2da5eb07300a894eeb5cfc5ba6eb] | committer: Christoph Miebach l10n: Punjabi update Signed-off-by: Christoph Miebach christoph.mieb...@web.de http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=20126e536a4e2da5eb07300a894eeb5cfc5ba6eb --- po/pa.po | 907 +++--- 1 file changed, 393 insertions(+), 514 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=20126e536a4e2da5eb07300a894eeb5cfc5ba6eb ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Make update-po
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Fri Aug 15 23:49:24 2014 +0200| [94b5dd5ef7c9d7502b8e45ec2baaebb9522d2d58] | committer: Jean-Baptiste Kempf Make update-po http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=94b5dd5ef7c9d7502b8e45ec2baaebb9522d2d58 --- po/POTFILES.in | 40 +- po/ach.po | 2650 +-- po/af.po | 2663 +-- po/am.po | 2667 +-- po/an.po | 2711 +-- po/ar.po | 2645 +-- po/ast.po | 2709 +-- po/az.po | 2627 -- po/be.po | 2733 +-- po/bg.po | 2721 +-- po/bn.po | 2669 +-- po/bn_IN.po| 2713 +-- po/br.po | 2662 +-- po/bs.po | 2633 +- po/ca.po | 2737 +-- po/cgg.po | 2661 +-- po/ckb.po | 2660 +-- po/co.po | 2642 +-- po/cs.po | 2641 +-- po/cy.po | 2635 +- po/da.po | 2664 +-- po/de.po | 2758 ++- po/el.po | 2725 +-- po/en_GB.po| 2668 +-- po/es.po | 2710 +-- po/et.po | 2666 +-- po/eu.po | 2734 +-- po/fa.po | 2631 +- po/ff.po | 2657 +-- po/fi.po | 2669 +-- po/fr.po | 2687 +-- po/fur.po | 2680 +-- po/ga.po | 2686 +-- po/gd.po | 2634 +- po/gl.po | 2740 +-- po/gu.po | 2651 +-- po/he.po | 2652 +-- po/hi.po | 2662 +-- po/hr.po | 2738 +-- po/hu.po | 2737 +-- po/hy.po | 2732 +-- po/ia.po | 2635 +- po/id.po | 2728 +-- po/is.po | 2669 +-- po/it.po | 2733 ++- po/ja.po | 2756 ++- po/ka.po | 2672 +-- po/kk.po | 2680 +-- po/km.po | 2728 +-- po/kn.po | 2712 +-- po/ko.po | 2754 ++- po/ky.po | 2644 +-- po/lg.po | 2669 +-- po/lt.po | 2707 +-- po/lv.po | 2650 +-- po/mk.po | 2641 +-- po/ml.po | 2639 +-- po/mn.po | 2658 +-- po/mr.po | 2665 +-- po/ms.po | 2758 ++- po/my.po | 2649 +-- po/nb.po | 2655 +-- po/ne.po | 2653 +-- po/nl.po | 2754 ++- po/nn.po | 2688 +-- po/oc.po | 2664 +-- po/or.po | 2646 +-- po/pa.po | 2659 +-- po/pl.po | 2752 ++- po/ps.po | 2652 +-- po/pt_BR.po| 2669 +-- po/pt_PT.po| 2686 +-- po/ro.po | 2658 +-- po/ru.po | 2754 ++- po/si.po | 2684 +-- po/sk.po | 2756 ++- po/sl.po | 2663 +-- po/sq.po | 2640 +-- po/sr.po | 2659 +-- po/sv.po | 2718 +-- po/ta.po | 2656 +-- po/te.po | 2663 +-- po/tet.po | 2651 +-- po/th.po | 2672 +-- po/tl.po | 2651 +-- po/tr.po | 2756 ++- po/uk.po | 8052 +++- po/uz.po | 2645 +-- po/vi.po | 2661 +-- po/vlc.pot | 2627 -- po/wa.po | 2698 +-- po/zh_CN.po| 2744 ++- po/zh_TW.po| 2647 +-- po/zu.po | 2669 +-- 94 files changed, 119679 insertions(+), 135170 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=94b5dd5ef7c9d7502b8e45ec2baaebb9522d2d58 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] PO: fix distcheck and nb encoding
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Sat Aug 16 00:06:51 2014 +0200| [610e4a753bceddb0cb280196231a1a2b2b288ff6] | committer: Jean-Baptiste Kempf PO: fix distcheck and nb encoding http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=610e4a753bceddb0cb280196231a1a2b2b288ff6 --- po/POTFILES.in | 40 po/nb.po |2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 8cb9086..f6f7e7e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1207,23 +1207,23 @@ share/lua/http/mobile_view.html # Qt4 .ui files # uncomment (and prepend $builddir} if you want to generate a proper vlc.pot -modules/gui/qt4/ui/about.h -modules/gui/qt4/ui/equalizer.h -modules/gui/qt4/ui/messages_panel.h -modules/gui/qt4/ui/open.h -modules/gui/qt4/ui/open_capture.h -modules/gui/qt4/ui/open_disk.h -modules/gui/qt4/ui/open_file.h -modules/gui/qt4/ui/open_net.h -modules/gui/qt4/ui/podcast_configuration.h -modules/gui/qt4/ui/profiles.h -modules/gui/qt4/ui/sout.h -modules/gui/qt4/ui/sprefs_audio.h -modules/gui/qt4/ui/sprefs_input.h -modules/gui/qt4/ui/sprefs_interface.h -modules/gui/qt4/ui/sprefs_subtitles.h -modules/gui/qt4/ui/sprefs_video.h -modules/gui/qt4/ui/streampanel.h -modules/gui/qt4/ui/update.h -modules/gui/qt4/ui/video_effects.h -modules/gui/qt4/ui/vlm.h +#modules/gui/qt4/ui/about.h +#modules/gui/qt4/ui/equalizer.h +#modules/gui/qt4/ui/messages_panel.h +#modules/gui/qt4/ui/open.h +#modules/gui/qt4/ui/open_capture.h +#modules/gui/qt4/ui/open_disk.h +#modules/gui/qt4/ui/open_file.h +#modules/gui/qt4/ui/open_net.h +#modules/gui/qt4/ui/podcast_configuration.h +#modules/gui/qt4/ui/profiles.h +#modules/gui/qt4/ui/sout.h +#modules/gui/qt4/ui/sprefs_audio.h +#modules/gui/qt4/ui/sprefs_input.h +#modules/gui/qt4/ui/sprefs_interface.h +#modules/gui/qt4/ui/sprefs_subtitles.h +#modules/gui/qt4/ui/sprefs_video.h +#modules/gui/qt4/ui/streampanel.h +#modules/gui/qt4/ui/update.h +#modules/gui/qt4/ui/video_effects.h +#modules/gui/qt4/ui/vlm.h diff --git a/po/nb.po b/po/nb.po index 3f49869..b4f2a69 100644 --- a/po/nb.po +++ b/po/nb.po @@ -11982,7 +11982,7 @@ msgstr #: modules/codec/subsdec.c:296 modules/demux/avi/avi.c:99 msgctxt GetACP msgid CP1252 -msgstr +msgstr CP1252 #: modules/codec/subsusf.c:46 msgid USFSubs ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] OSX growl: fix compilation
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Sat Aug 16 01:12:05 2014 +0200| [67d1a86303e1368278bbdcba46321731fd000bfc] | committer: Jean-Baptiste Kempf OSX growl: fix compilation http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=67d1a86303e1368278bbdcba46321731fd000bfc --- modules/notify/growl.m |1 + 1 file changed, 1 insertion(+) diff --git a/modules/notify/growl.m b/modules/notify/growl.m index e8e5226..9501083 100644 --- a/modules/notify/growl.m +++ b/modules/notify/growl.m @@ -57,6 +57,7 @@ #include vlc_common.h #include vlc_plugin.h #include vlc_playlist.h +#include vlc_input.h #include vlc_meta.h #include vlc_interface.h #include vlc_url.h ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Update NEWS
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Sat Aug 16 01:52:31 2014 +0200| [c0fa66fa9ebf7c2aa9d6b94b24270b23e782121c] | committer: Jean-Baptiste Kempf Update NEWS http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=c0fa66fa9ebf7c2aa9d6b94b24270b23e782121c --- NEWS | 36 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index 7a381db..732affe 100644 --- a/NEWS +++ b/NEWS @@ -2,20 +2,21 @@ Changes between 2.1.x and 2.2.0-pre1: Important changes: - * The licenses of more modules have changed from GPLv2+ to LGPLv2.1+ + * The licenses of more modules have changed from GPLv2+ to LGPLv2.1+, + notably the streaming output, muxers and access output ones Core: - * Partial fix of playback of short audio samples - * Add extensions download from external repositories * Support automatic rotation using streams metadata, GPU-accelerated when possible + * Add extensions download from external repositories * Rework the metadata fetching algorithm and policies + * Partial fix of playback of short audio samples Access: - * Added TLS support for ftp access and sout access. - New schemes for implicit (ftps) and explicit (ftpes) modes. + * Added TLS support for ftp access and sout access + New schemes for implicit (ftps) and explicit (ftpes) modes * MMS audio selection on split audio streams * Blu-Ray: support overlays, preferred menu languages, region selection - and navigation + and BD-J navigation * Digital Cinema Package support, including encrypted DCP with KDM * Partial fixes for Arccos protected DVDs @@ -50,13 +51,15 @@ Encoder: * New png image encoder using libpng Demuxer: - * New CAF format module + * Support for Core Audio Format (CAF) files * Important rework of the Ogg demuxer, notably improving seeking, streaming resilience, speex demuxing and chained Ogg * Important rework of the ASF/WMV demuxer, notably for seeking, synchronization and tracks exclusion * AVI improvements for better seek-indexing in non-fastseekable situations * AVI fixes for uncompressed, indexed and paletized bitmaps + * MP4 fixes for fragmented files, vobsub, duration, aspect-ratio + and support for rotation, covr atom and tracks exclusion * Support Opus in MKV * Support VP8 in OGG * Basic support for WebVTT @@ -70,19 +73,11 @@ Demuxer: * New HEVC raw packetizer and demuxer * TS support for WiDi/Miracast LPCM * Handle MOV/MP4 tx3g styled subtitles through codec - * MP4 fixes for fragmented files, vobsub, duration, aspect-ratio - and support for rotation, covr atom and tracks exclusion * Support SVG images files (on glib platforms) * Keep selection of tracks on segment changes in MKV * Support detection of SRT languages based on filename * Support for seeking Standard MIDI Files -Muxers: - * Important rework of the Ogg muxer, notably for skeleton - * Fixes for the AVI muxer for specification respect - * Support VP8 in OGG - * Add HEVC muxing in MP4 and TS - Video Output: * Direct rendering and filtering for VDPAU hardware acceleration * New CoreAnimation OpenGL video output module for NPAPI plugins @@ -108,6 +103,12 @@ Audio Output: * Numerous fixes on AUHAL, including device management and stream changes * Fixes for SPDIF passthru in most modules +Muxers: + * Important rework of the Ogg muxer, notably for skeleton + * Fixes for the AVI muxer to respect the specification + * Support VP8 in OGG + * Add HEVC muxing in MP4 and TS + Streaming: * Important rework of the transcoding module to fix numerous bugs * WebM streaming, including live sources, compatible with all major browsers @@ -119,7 +120,7 @@ Streaming: * transcode module access fps values as rationals now, eg 3/1001 * VLC now streams all elementary streams, you can revert to previous behaviour with --no-sout-all - * --ts-out option has been removed, it has been superceded by --demux demuxdump + * --ts-out option has been removed, it has been superceded by --demux demuxdump --demuxdump-access udp --demuxdump-file 127.0.0.1:1234 * Support Metacube protocol when streaming over HTTP @@ -154,6 +155,9 @@ Removed modules: * OpenMash H.261 video decoder * dirac encoder: use schroedinger +Translations: + * Update of all translations + Changes between 2.1.3 and 2.1.4: ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] NEWS: forward port NEWS from 2.2.x and 2.1.5
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Sat Aug 16 02:39:27 2014 +0200| [3245ccfbe8dbf3eea2b68c1666c47099c7bb523d] | committer: Jean-Baptiste Kempf NEWS: forward port NEWS from 2.2.x and 2.1.5 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3245ccfbe8dbf3eea2b68c1666c47099c7bb523d --- NEWS | 70 -- 1 file changed, 56 insertions(+), 14 deletions(-) diff --git a/NEWS b/NEWS index 0563c4f..ff86e2a 100644 --- a/NEWS +++ b/NEWS @@ -29,20 +29,22 @@ Changes between 2.1.x and 2.2.0: Important changes: - * The licenses of more modules have changed from GPLv2+ to LGPLv2.1+ + * The licenses of more modules have changed from GPLv2+ to LGPLv2.1+, + notably the streaming output, muxers and access output ones Core: + * Support automatic rotation using streams metadata, GPU-accelerated when possible * Partial fix of playback of short audio samples * Add extensions download from external repositories * Support automatic rotation using streams metadata, GPU-accelerated when possible * Rework the metadata fetching algorithm and policies Access: - * Added TLS support for ftp access and sout access. - New schemes for implicit (ftps) and explicit (ftpes) modes. + * Added TLS support for ftp access and sout access + New schemes for implicit (ftps) and explicit (ftpes) modes * MMS audio selection on split audio streams * Blu-Ray: support overlays, preferred menu languages, region selection - and navigation + and BD-J navigation * Digital Cinema Package support, including encrypted DCP with KDM * Partial fixes for Arccos protected DVDs @@ -77,13 +79,15 @@ Encoder: * New png image encoder using libpng Demuxer: - * New CAF format module + * Support for Core Audio Format (CAF) files * Important rework of the Ogg demuxer, notably improving seeking, streaming resilience, speex demuxing and chained Ogg * Important rework of the ASF/WMV demuxer, notably for seeking, synchronization and tracks exclusion * AVI improvements for better seek-indexing in non-fastseekable situations * AVI fixes for uncompressed, indexed and paletized bitmaps + * MP4 fixes for fragmented files, vobsub, duration, aspect-ratio + and support for rotation, covr atom and tracks exclusion * Support Opus in MKV * Support VP8 in OGG * Basic support for WebVTT @@ -97,19 +101,11 @@ Demuxer: * New HEVC raw packetizer and demuxer * TS support for WiDi/Miracast LPCM * Handle MOV/MP4 tx3g styled subtitles through codec - * MP4 fixes for fragmented files, vobsub, duration, aspect-ratio - and support for rotation, covr atom and tracks exclusion * Support SVG images files (on glib platforms) * Keep selection of tracks on segment changes in MKV * Support detection of SRT languages based on filename * Support for seeking Standard MIDI Files -Muxers: - * Important rework of the Ogg muxer, notably for skeleton - * Fixes for the AVI muxer for specification respect - * Support VP8 in OGG - * Add HEVC muxing in MP4 and TS - Video Output: * Direct rendering and filtering for VDPAU hardware acceleration * New CoreAnimation OpenGL video output module for NPAPI plugins @@ -135,6 +131,12 @@ Audio Output: * Numerous fixes on AUHAL, including device management and stream changes * Fixes for SPDIF passthru in most modules +Muxers: + * Important rework of the Ogg muxer, notably for skeleton + * Fixes for the AVI muxer to respect the specification + * Support VP8 in OGG + * Add HEVC muxing in MP4 and TS + Streaming: * Important rework of the transcoding module to fix numerous bugs * WebM streaming, including live sources, compatible with all major browsers @@ -146,7 +148,7 @@ Streaming: * transcode module access fps values as rationals now, eg 3/1001 * VLC now streams all elementary streams, you can revert to previous behaviour with --no-sout-all - * --ts-out option has been removed, it has been superceded by --demux demuxdump + * --ts-out option has been removed, it has been superceded by --demux demuxdump --demuxdump-access udp --demuxdump-file 127.0.0.1:1234 * Support Metacube protocol when streaming over HTTP @@ -181,6 +183,46 @@ Removed modules: * OpenMash H.261 video decoder * dirac encoder: use schroedinger +Translations: + * Update of all translations + + +Changes between 2.1.4 and 2.1.5: + + +Core: + * Fix compilation on OS/2 + +Access: + * Stability improvements for the QTSound capture module + +Mac OS X audio output: + * Fix channel ordering + * Increase the buffersize + +Decoders: + * Fix DxVA2 decoding of samples needing more surfaces + * Improve MAD resistance to broken mp3 streams + * Fix PGS alignment in MKV + +Qt Interface: + * Don't rename mp3 converted files to .raw + +Mac OS X Interface: + * Correctly support video-on-top + * Fix video output event propagation on Macs with
[vlc-commits] Tag 2.2.0-pre1 : VLC media player 2.2.0-pre1 'Weatherwax'
[vlc/vlc-2.2] [branch: refs/tags/2.2.0-pre1] Tag:9e7a110001f064c22bace186df5d2392ac2c32f7 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git?a=tag;h=9e7a110001f064c22bace186df5d2392ac2c32f7 Tagger: Jean-Baptiste Kempf j...@videolan.org Date: Sat Aug 16 02:18:18 2014 +0200 VLC media player 2.2.0-pre1 'Weatherwax' This is the first pre-release of VLC media player 2.2.0 This is a major version of VLC media player, introducing many new features fixing numerous bugs (~500 since 2.1.5, ~800 since 2.1.0). Notable features of this release are: - Hardware decoding and zero-copy rendering for Linux (VDPAU), Android (MediaCodec), Linux rPI (MMAL) - Automatic rotation to fight Vertical Video Syndrome, GPU accelerated - New formats supported, like MKV/Opus/VP9, H.265, Ogg/VP8, CAF, raw H.265 - Support for Digital Cinema Packages, Blu-Ray BD-J, FTPS - Restart where you left off feature on Qt and OS X interfaces - VLC Extensions and Addons downloader - HLSL shaders on Windows and CoreAnimation output on OS X - Port of the core on iOS, Android and WinRT Numerous bugs have been fixed: - Important refactor of the AVI, WMV, OGG and MP4 demuxers - Audio loops on Windows using DirectSound - OpenMax IL decoder, Speex, SRT support - AVI, Ogg and MP4 muxer Updates of the translations are, of course, present too. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] NEWS: forwardport 2.1.5 NEWS
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Sat Aug 16 02:36:30 2014 +0200| [2a756bf35317f52058e9cc868366f20b05ffd88a] | committer: Jean-Baptiste Kempf NEWS: forwardport 2.1.5 NEWS http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2a756bf35317f52058e9cc868366f20b05ffd88a --- NEWS | 37 + 1 file changed, 37 insertions(+) diff --git a/NEWS b/NEWS index 732affe..8d035ba 100644 --- a/NEWS +++ b/NEWS @@ -159,6 +159,43 @@ Translations: * Update of all translations +Changes between 2.1.4 and 2.1.5: + + +Core: + * Fix compilation on OS/2 + +Access: + * Stability improvements for the QTSound capture module + +Mac OS X audio output: + * Fix channel ordering + * Increase the buffersize + +Decoders: + * Fix DxVA2 decoding of samples needing more surfaces + * Improve MAD resistance to broken mp3 streams + * Fix PGS alignment in MKV + +Qt Interface: + * Don't rename mp3 converted files to .raw + +Mac OS X Interface: + * Correctly support video-on-top + * Fix video output event propagation on Macs with retina displays + * Stability improvements when using future VLC releases side by side + +Streaming: + * Fix transcode when audio format changes + +Security contents: + * Updated GnuTLS to 3.1.25 (CVE-2014-3466) + * Updated libpng to 1.6.10 (CVE-2014-0333) + +Translations: + * Update British English + + Changes between 2.1.3 and 2.1.4: ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] NEWS: forward port NEWS from 2.2.x and 2.1.5
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Sat Aug 16 02:39:27 2014 +0200| [ce08131bd90039fee0655c6dffb1397e3622755a] | committer: Jean-Baptiste Kempf NEWS: forward port NEWS from 2.2.x and 2.1.5 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ce08131bd90039fee0655c6dffb1397e3622755a --- NEWS | 71 -- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index 0563c4f..d290d06 100644 --- a/NEWS +++ b/NEWS @@ -29,20 +29,21 @@ Changes between 2.1.x and 2.2.0: Important changes: - * The licenses of more modules have changed from GPLv2+ to LGPLv2.1+ + * The licenses of more modules have changed from GPLv2+ to LGPLv2.1+, + notably the streaming output, muxers and access output ones Core: + * Support automatic rotation using streams metadata, GPU-accelerated when possible * Partial fix of playback of short audio samples * Add extensions download from external repositories - * Support automatic rotation using streams metadata, GPU-accelerated when possible * Rework the metadata fetching algorithm and policies Access: - * Added TLS support for ftp access and sout access. - New schemes for implicit (ftps) and explicit (ftpes) modes. + * Added TLS support for ftp access and sout access + New schemes for implicit (ftps) and explicit (ftpes) modes * MMS audio selection on split audio streams * Blu-Ray: support overlays, preferred menu languages, region selection - and navigation + and BD-J navigation * Digital Cinema Package support, including encrypted DCP with KDM * Partial fixes for Arccos protected DVDs @@ -77,13 +78,15 @@ Encoder: * New png image encoder using libpng Demuxer: - * New CAF format module + * Support for Core Audio Format (CAF) files * Important rework of the Ogg demuxer, notably improving seeking, streaming resilience, speex demuxing and chained Ogg * Important rework of the ASF/WMV demuxer, notably for seeking, synchronization and tracks exclusion * AVI improvements for better seek-indexing in non-fastseekable situations * AVI fixes for uncompressed, indexed and paletized bitmaps + * MP4 fixes for fragmented files, vobsub, duration, aspect-ratio + and support for rotation, covr atom and tracks exclusion * Support Opus in MKV * Support VP8 in OGG * Basic support for WebVTT @@ -97,19 +100,11 @@ Demuxer: * New HEVC raw packetizer and demuxer * TS support for WiDi/Miracast LPCM * Handle MOV/MP4 tx3g styled subtitles through codec - * MP4 fixes for fragmented files, vobsub, duration, aspect-ratio - and support for rotation, covr atom and tracks exclusion * Support SVG images files (on glib platforms) * Keep selection of tracks on segment changes in MKV * Support detection of SRT languages based on filename * Support for seeking Standard MIDI Files -Muxers: - * Important rework of the Ogg muxer, notably for skeleton - * Fixes for the AVI muxer for specification respect - * Support VP8 in OGG - * Add HEVC muxing in MP4 and TS - Video Output: * Direct rendering and filtering for VDPAU hardware acceleration * New CoreAnimation OpenGL video output module for NPAPI plugins @@ -135,6 +130,12 @@ Audio Output: * Numerous fixes on AUHAL, including device management and stream changes * Fixes for SPDIF passthru in most modules +Muxers: + * Important rework of the Ogg muxer, notably for skeleton + * Fixes for the AVI muxer to respect the specification + * Support VP8 in OGG + * Add HEVC muxing in MP4 and TS + Streaming: * Important rework of the transcoding module to fix numerous bugs * WebM streaming, including live sources, compatible with all major browsers @@ -146,7 +147,7 @@ Streaming: * transcode module access fps values as rationals now, eg 3/1001 * VLC now streams all elementary streams, you can revert to previous behaviour with --no-sout-all - * --ts-out option has been removed, it has been superceded by --demux demuxdump + * --ts-out option has been removed, it has been superceded by --demux demuxdump --demuxdump-access udp --demuxdump-file 127.0.0.1:1234 * Support Metacube protocol when streaming over HTTP @@ -181,6 +182,46 @@ Removed modules: * OpenMash H.261 video decoder * dirac encoder: use schroedinger +Translations: + * Update of all translations + + +Changes between 2.1.4 and 2.1.5: + + +Core: + * Fix compilation on OS/2 + +Access: + * Stability improvements for the QTSound capture module + +Mac OS X audio output: + * Fix channel ordering + * Increase the buffersize + +Decoders: + * Fix DxVA2 decoding of samples needing more surfaces + * Improve MAD resistance to broken mp3 streams + * Fix PGS alignment in MKV + +Qt Interface: + * Don't rename mp3 converted files to .raw + +Mac OS X Interface: + * Correctly support video-on-top + * Fix video output event propagation on Macs with
[vlc-commits] contrib: update aribb24 1.0.2
vlc | branch: master | Naohiro KORIYAMA nkoriy...@gmail.com | Fri Aug 15 22:23:30 2014 +0900| [9dd3f7111a6cdef9e5b609c69c9c9e13ec40c266] | committer: Francois Cartegnie contrib: update aribb24 1.0.2 Signed-off-by: Francois Cartegnie fcvlc...@free.fr http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9dd3f7111a6cdef9e5b609c69c9c9e13ec40c266 --- contrib/src/aribb24/SHA512SUMS |2 +- contrib/src/aribb24/rules.mak |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/src/aribb24/SHA512SUMS b/contrib/src/aribb24/SHA512SUMS index 3982f58..9ef8408 100644 --- a/contrib/src/aribb24/SHA512SUMS +++ b/contrib/src/aribb24/SHA512SUMS @@ -1 +1 @@ -6d0c8d78fe3db3fff7ff2af54677b2d8a663197c66e860ff01d0c6dd0aa45eeb5c2404a7a34cc6cec2dcb6fd72ba55e3a1be23225a8934ba74479e1f779a9692 aribb24-1.0.1.tar.bz2 +05562c1e8038e471b31caac75164cc398150abe17cdab57c4fe019fee431db0f5ac764a6f3edaea55ce5aad1d15c8e435138b094fa279f112fe02beea60b710a aribb24-1.0.2.tar.bz2 diff --git a/contrib/src/aribb24/rules.mak b/contrib/src/aribb24/rules.mak index 129ee42..fae16e1 100644 --- a/contrib/src/aribb24/rules.mak +++ b/contrib/src/aribb24/rules.mak @@ -1,6 +1,6 @@ # aribb24 -ARIBB24_VERSION := 1.0.1 +ARIBB24_VERSION := 1.0.2 ARIBB24_URL := https://github.com/nkoriyama/aribb24/releases/download/v$(ARIBB24_VERSION)/aribb24-$(ARIBB24_VERSION).tar.bz2 PKGS += aribb24 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
