[vlc-commits] macosx: fix typo for Mexican in language list

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Thu 
May 23 07:25:27 2019 +0200| [928c8a600e0dff712479d3b1d6e022bcb2b4252b] | 
committer: David Fuhrmann

macosx: fix typo for Mexican in language list

(cherry picked from commit 309295c46480158f4e747a9c65168142373c09ed)
Signed-off-by: David Fuhrmann 

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

 modules/gui/macosx/VLCSimplePrefsController.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/macosx/VLCSimplePrefsController.m 
b/modules/gui/macosx/VLCSimplePrefsController.m
index 4aa95d3b61..8f20d5ab3e 100644
--- a/modules/gui/macosx/VLCSimplePrefsController.m
+++ b/modules/gui/macosx/VLCSimplePrefsController.m
@@ -109,7 +109,7 @@ static struct {
 { "sk","Slovensky", NO },
 { "sl","slovenščina",   NO },
 { "es","Español",   NO },
-{ "es","Español Mexicano",  NO },
+{ "es_MX", "Español Mexicano",  NO },
 { "sv","Svenska",   NO },
 { "th","ภาษาไทย",   NO },
 { "tr","Türkçe",NO },

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

[vlc-commits] qt: fix typo for Mexican in language list

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Thu 
May 23 07:24:41 2019 +0200| [3042dcc569f6cf6034b03c6a761f79170466a28a] | 
committer: David Fuhrmann

qt: fix typo for Mexican in language list

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

 modules/gui/qt/components/simple_preferences.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt/components/simple_preferences.cpp 
b/modules/gui/qt/components/simple_preferences.cpp
index f13cb49a96..8d27260fda 100644
--- a/modules/gui/qt/components/simple_preferences.cpp
+++ b/modules/gui/qt/components/simple_preferences.cpp
@@ -123,7 +123,7 @@ static struct {
 { "sk","Slovensky" },
 { "sl","slovenščina" },
 { "es","Español" },
-{ "es","Español Mexicano" },
+{ "es_MX", "Español Mexicano" },
 { "sv","Svenska" },
 { "th","ภาษาไทย" },
 { "tr","Türkçe" },

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

[vlc-commits] macosx: fix typo for Mexican in language list

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Thu May 23 
07:25:27 2019 +0200| [309295c46480158f4e747a9c65168142373c09ed] | committer: 
David Fuhrmann

macosx: fix typo for Mexican in language list

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

 modules/gui/macosx/preferences/VLCSimplePrefsController.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/macosx/preferences/VLCSimplePrefsController.m 
b/modules/gui/macosx/preferences/VLCSimplePrefsController.m
index 0b6931587f..3884f7f05e 100644
--- a/modules/gui/macosx/preferences/VLCSimplePrefsController.m
+++ b/modules/gui/macosx/preferences/VLCSimplePrefsController.m
@@ -110,7 +110,7 @@ static struct {
 { "sk","Slovensky", NO },
 { "sl","slovenščina",   NO },
 { "es","Español",   NO },
-{ "es","Español Mexicano",  NO },
+{ "es_MX", "Español Mexicano",  NO },
 { "sv","Svenska",   NO },
 { "th","ภาษาไทย",   NO },
 { "tr","Türkçe",NO },

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

[vlc-commits] player: make the lock optionally reentrant

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Mon May 13 14:39:35 
2019 +0200| [cff059cc20213fc6ce892202ab82f229e857c457] | committer: 
Jean-Baptiste Kempf

player: make the lock optionally reentrant

This will allow to implement the old libvlc API using the new player.



Signed-off-by: Jean-Baptiste Kempf 

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

 include/vlc_player.h| 25 -
 src/input/player.c  | 12 
 src/playlist/player.c   |  3 ++-
 src/playlist/playlist.h |  3 ++-
 test/src/input/player.c |  6 --
 5 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/include/vlc_player.h b/include/vlc_player.h
index 1aa5f8e687..d4c49fa89d 100644
--- a/include/vlc_player.h
+++ b/include/vlc_player.h
@@ -331,6 +331,29 @@ enum vlc_player_subtitle_sync
 VLC_PLAYER_SUBTITLE_SYNC_APPLY,
 };
 
+/**
+ * Player lock type (normal or reentrant)
+ */
+enum vlc_player_lock_type
+{
+/**
+ * Normal lock
+ *
+ * If the player is already locked, subsequent calls to vlc_player_Lock()
+ * will deadlock.
+ */
+VLC_PLAYER_LOCK_NORMAL,
+
+/**
+ * Reentrant lock
+ *
+ * If the player is already locked, subsequent calls to vlc_player_Lock()
+ * will still succeed. To unlock the player, one call to
+ * vlc_player_Unlock() per vlc_player_Lock() is necessary.
+ */
+VLC_PLAYER_LOCK_REENTRANT,
+};
+
 /** Player capability: can seek */
 #define VLC_PLAYER_CAP_SEEK (1<<0)
 /** Player capability: can pause */
@@ -1005,7 +1028,7 @@ vlc_player_title_list_GetAt(vlc_player_title_list 
*titles, size_t idx);
  * @return a pointer to a valid player instance or NULL in case of error
  */
 VLC_API vlc_player_t *
-vlc_player_New(vlc_object_t *parent,
+vlc_player_New(vlc_object_t *parent, enum vlc_player_lock_type lock_type,
const struct vlc_player_media_provider *media_provider,
void *media_provider_data);
 
diff --git a/src/input/player.c b/src/input/player.c
index da02375a66..e01701ba65 100644
--- a/src/input/player.c
+++ b/src/input/player.c
@@ -3367,9 +3367,13 @@ vlc_player_vout_Snapshot(vlc_player_t *player)
 }
 
 static void
-vlc_player_InitLocks(vlc_player_t *player)
+vlc_player_InitLocks(vlc_player_t *player, enum vlc_player_lock_type lock_type)
 {
-vlc_mutex_init(>lock);
+if (lock_type == VLC_PLAYER_LOCK_REENTRANT)
+vlc_mutex_init_recursive(>lock);
+else
+vlc_mutex_init(>lock);
+
 vlc_mutex_init(>vout_listeners_lock);
 vlc_mutex_init(>aout_listeners_lock);
 vlc_cond_init(>start_delay_cond);
@@ -3426,7 +3430,7 @@ vlc_player_Delete(vlc_player_t *player)
 }
 
 vlc_player_t *
-vlc_player_New(vlc_object_t *parent,
+vlc_player_New(vlc_object_t *parent, enum vlc_player_lock_type lock_type,
const struct vlc_player_media_provider *media_provider,
void *media_provider_data)
 {
@@ -3514,7 +3518,7 @@ vlc_player_New(vlc_object_t *parent,
 }
 
 player->deleting = false;
-vlc_player_InitLocks(player);
+vlc_player_InitLocks(player, lock_type);
 
 if (vlc_clone(>destructor.thread, vlc_player_destructor_Thread,
   player, VLC_THREAD_PRIORITY_LOW) != 0)
diff --git a/src/playlist/player.c b/src/playlist/player.c
index 6ca6ea0636..ef65011fef 100644
--- a/src/playlist/player.c
+++ b/src/playlist/player.c
@@ -134,7 +134,8 @@ static const struct vlc_player_cbs player_callbacks = {
 bool
 vlc_playlist_PlayerInit(vlc_playlist_t *playlist, vlc_object_t *parent)
 {
-playlist->player = vlc_player_New(parent, _media_provider, 
playlist);
+playlist->player = vlc_player_New(parent, VLC_PLAYER_LOCK_NORMAL,
+  _media_provider, playlist);
 if (unlikely(!playlist->player))
 return false;
 
diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h
index 253b8265ec..ef476f0597 100644
--- a/src/playlist/playlist.h
+++ b/src/playlist/playlist.h
@@ -31,7 +31,8 @@ typedef struct input_item_t input_item_t;
 
 #ifdef TEST_PLAYLIST
 /* mock the player in tests */
-# define vlc_player_New(a,b,c) (VLC_UNUSED(a), VLC_UNUSED(b), malloc(1))
+# define vlc_player_New(a,b,c,d) (VLC_UNUSED(a), VLC_UNUSED(b), VLC_UNUSED(c), 
\
+ malloc(1))
 # define vlc_player_Delete(p) free(p)
 # define vlc_player_Lock(p) VLC_UNUSED(p)
 # define vlc_player_Unlock(p) VLC_UNUSED(p)
diff --git a/test/src/input/player.c b/test/src/input/player.c
index 91b2bdd474..8406e4352f 100644
--- a/test/src/input/player.c
+++ b/test/src/input/player.c
@@ -1668,7 +1668,8 @@ static void
 test_delete_while_playback(vlc_object_t *obj, bool start)
 {
 test_log("delete_while_playback (start: %d)\n", start);
-vlc_player_t *player = vlc_player_New(obj, NULL, NULL);
+vlc_player_t *player = vlc_player_New(obj, VLC_PLAYER_LOCK_NORMAL,
+ 

[vlc-commits] libvlc: player: send EndReached on input ended

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Tue May 14 12:43:10 
2019 +0200| [24c260aabdc9dad5f7b807f4dca2ed2afcbcdae1] | committer: 
Jean-Baptiste Kempf

libvlc: player: send EndReached on input ended

Use the specific libvlc event when the input end is reached.

Signed-off-by: Jean-Baptiste Kempf 

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

 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 ddb5509721..35640b3e85 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -343,7 +343,7 @@ input_event_changed( vlc_object_t * p_this, char const * 
psz_cmd,
 else if( newval.i_int == INPUT_EVENT_DEAD )
 {
 libvlc_state_t libvlc_state = libvlc_Ended;
-event.type = libvlc_MediaPlayerStopped;
+event.type = libvlc_MediaPlayerEndReached;
 
 set_state( p_mi, libvlc_state, false );
 libvlc_event_send( _mi->event_manager,  );

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

[vlc-commits] libvlc: doc: list breaking changes

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Mon May 20 15:48:57 
2019 +0200| [70ee5693df6cf6e6676e8bf38b3376e03a4ee933] | committer: 
Jean-Baptiste Kempf

libvlc: doc: list breaking changes

Signed-off-by: Jean-Baptiste Kempf 

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

 doc/libvlc/CHANGES-v3-to-v4.txt | 8 
 1 file changed, 8 insertions(+)

diff --git a/doc/libvlc/CHANGES-v3-to-v4.txt b/doc/libvlc/CHANGES-v3-to-v4.txt
new file mode 100644
index 00..919a41cd8b
--- /dev/null
+++ b/doc/libvlc/CHANGES-v3-to-v4.txt
@@ -0,0 +1,8 @@
+Breaking changes between libvlc 3 and libvlc 4:
+- libvlc_media_player_will_play() is removed (it is meaningless with the
+  new player)
+- libvlc_media_player callbacks are called with the same (recursive)
+  mutex as libvlc_media_player functions
+- libvlc_media_player_stop() is now asynchronous
+- libvlc_media_player_set_pause() and libvlc_media_player_set_media(), which
+  could possibly stop, are now asynchronous too

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

[vlc-commits] libvlc: player: fix racy tests

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Tue May 14 12:40:05 
2019 +0200| [ddee82e3b992f5e2a3f9c860db21988113ca379b] | committer: 
Jean-Baptiste Kempf

libvlc: player: fix racy tests

In order to wait for a specific state, libvlc player tests used live
loops to read the player state.

Listen to state changes instead.

Signed-off-by: Jean-Baptiste Kempf 

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

 test/Makefile.am   |  2 +-
 test/libvlc/media_player.c | 85 +-
 2 files changed, 55 insertions(+), 32 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 8343bea501..625f8d3453 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -98,7 +98,7 @@ test_libvlc_media_list_player_LDADD = $(LIBVLC)
 test_libvlc_media_list_SOURCES = libvlc/media_list.c
 test_libvlc_media_list_LDADD = $(LIBVLC)
 test_libvlc_media_player_SOURCES = libvlc/media_player.c
-test_libvlc_media_player_LDADD = $(LIBVLC)
+test_libvlc_media_player_LDADD = $(LIBVLCCORE) $(LIBVLC)
 test_libvlc_media_discoverer_SOURCES = libvlc/media_discoverer.c
 test_libvlc_media_discoverer_LDADD = $(LIBVLC)
 test_libvlc_renderer_discoverer_SOURCES = libvlc/renderer_discoverer.c
diff --git a/test/libvlc/media_player.c b/test/libvlc/media_player.c
index 5417fd7561..2489e6f5fa 100644
--- a/test/libvlc/media_player.c
+++ b/test/libvlc/media_player.c
@@ -21,30 +21,61 @@
  **/
 
 #include "test.h"
+#include 
 
-static void wait_playing(libvlc_media_player_t *mp)
+static void on_event(const struct libvlc_event_t *event, void *data)
 {
-libvlc_state_t state;
-do {
-state = libvlc_media_player_get_state (mp);
-} while(state != libvlc_Playing &&
-state != libvlc_Error &&
-state != libvlc_Ended );
-
-state = libvlc_media_player_get_state (mp);
-assert(state == libvlc_Playing || state == libvlc_Ended);
+(void) event;
+vlc_sem_t *sem = data;
+vlc_sem_post(sem);
 }
 
-static void wait_paused(libvlc_media_player_t *mp)
+static void play_and_wait(libvlc_media_player_t *mp)
 {
-libvlc_state_t state;
-do {
-state = libvlc_media_player_get_state (mp);
-} while(state != libvlc_Paused &&
-state != libvlc_Ended );
-
-state = libvlc_media_player_get_state (mp);
-assert(state == libvlc_Paused || state == libvlc_Ended);
+libvlc_event_manager_t *em = libvlc_media_player_event_manager(mp);
+
+vlc_sem_t sem;
+vlc_sem_init(, 0);
+
+int res;
+res = libvlc_event_attach(em, libvlc_MediaPlayerPlaying, on_event, );
+assert(!res);
+
+libvlc_media_player_play(mp);
+
+test_log("Waiting for playing\n");
+vlc_sem_wait();
+
+libvlc_event_detach(em, libvlc_MediaPlayerPlaying, on_event, );
+
+vlc_sem_destroy();
+}
+
+static void pause_and_wait(libvlc_media_player_t *mp)
+{
+libvlc_event_manager_t *em = libvlc_media_player_event_manager(mp);
+
+vlc_sem_t sem;
+vlc_sem_init(, 0);
+
+int res;
+res = libvlc_event_attach(em, libvlc_MediaPlayerPaused, on_event, );
+assert(!res);
+res = libvlc_event_attach(em, libvlc_MediaPlayerEndReached, on_event, 
);
+assert(!res);
+
+libvlc_media_player_set_pause(mp, true);
+
+/* the end may have been already reached before attaching the event */
+if (libvlc_media_player_get_state(mp) == libvlc_Playing)
+{
+test_log("Waiting for pause\n");
+vlc_sem_wait();
+}
+
+vlc_sem_destroy();
+libvlc_event_detach(em, libvlc_MediaPlayerPaused, on_event, );
+libvlc_event_detach(em, libvlc_MediaPlayerEndReached, on_event, );
 }
 
 /* Test a bunch of A/V properties. This most does nothing since the current
@@ -111,9 +142,7 @@ static void test_media_player_set_media(const char** argv, 
int argc)
 
 libvlc_media_release (md);
 
-libvlc_media_player_play (mp);
-
-wait_playing (mp);
+play_and_wait(mp);
 
 libvlc_media_player_stop (mp);
 libvlc_media_player_release (mp);
@@ -140,9 +169,7 @@ static void test_media_player_play_stop(const char** argv, 
int argc)
 
 libvlc_media_release (md);
 
-libvlc_media_player_play (mi);
-
-wait_playing (mi);
+play_and_wait(mi);
 
 libvlc_media_player_stop (mi);
 libvlc_media_player_release (mi);
@@ -172,14 +199,10 @@ static void test_media_player_pause_stop(const char** 
argv, int argc)
 test_audio_video(mi);
 test_role(mi);
 
-libvlc_media_player_play (mi);
-test_log ("Waiting for playing\n");
-wait_playing (mi);
+play_and_wait(mi);
 test_audio_video(mi);
 
-libvlc_media_player_set_pause (mi, true);
-test_log ("Waiting for pause\n");
-wait_paused (mi);
+pause_and_wait(mi);
 test_audio_video(mi);
 
 libvlc_media_player_stop (mi);

___
vlc-commits mailing list
vlc-commits@videolan.org

[vlc-commits] libvlc: player: use vlc_player

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Mon May 13 14:01:55 
2019 +0200| [c0c35a50025df54cee95ddb00b325438b1f47e5e] | committer: 
Jean-Baptiste Kempf

libvlc: player: use vlc_player

Implement the old libvlc player API using the new vlc_player.

Signed-off-by: Jean-Baptiste Kempf 

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

 lib/audio.c |   95 ++-
 lib/media_player.c  | 1622 +++
 lib/media_player_internal.h |   21 +-
 lib/video.c |  266 +++
 4 files changed, 839 insertions(+), 1165 deletions(-)

diff --git a/lib/audio.c b/lib/audio.c
index 751584d0f1..f5e4493138 100644
--- a/lib/audio.c
+++ b/lib/audio.c
@@ -50,7 +50,7 @@ static audio_output_t *GetAOut( libvlc_media_player_t *mp )
 {
 assert( mp != NULL );
 
-audio_output_t *p_aout = input_resource_HoldAout( mp->input.p_resource );
+audio_output_t *p_aout = vlc_player_aout_Hold(mp->player);
 if( p_aout == NULL )
 libvlc_printerr( "No active audio output" );
 return p_aout;
@@ -131,14 +131,6 @@ int libvlc_audio_output_set( libvlc_media_player_t *mp, 
const char *psz_name )
 var_SetString( mp, "aout", value );
 free( value );
 
-/* Forget the existing audio output */
-input_resource_ResetAout(mp->input.p_resource);
-
-/* Create a new audio output */
-audio_output_t *aout = input_resource_GetAout(mp->input.p_resource);
-if( aout != NULL )
-input_resource_PutAout(mp->input.p_resource, aout);
-
 return 0;
 }
 
@@ -340,16 +332,13 @@ int libvlc_audio_set_volume( libvlc_media_player_t *mp, 
int volume )
  */
 int libvlc_audio_get_track_count( libvlc_media_player_t *p_mi )
 {
-input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
-int i_track_count;
+vlc_player_t *player = p_mi->player;
+vlc_player_Lock(player);
 
-if( !p_input_thread )
-return -1;
+int ret = vlc_player_GetTrackCount(p_mi->player, AUDIO_ES);
 
-i_track_count = var_CountChoices( p_input_thread, "audio-es" );
-
-input_Release(p_input_thread);
-return i_track_count;
+vlc_player_Unlock(player);
+return ret;
 }
 
 /*
@@ -358,7 +347,7 @@ int libvlc_audio_get_track_count( libvlc_media_player_t 
*p_mi )
 libvlc_track_description_t *
 libvlc_audio_get_track_description( libvlc_media_player_t *p_mi )
 {
-return libvlc_get_track_description( p_mi, "audio-es" );
+return libvlc_get_track_description( p_mi, AUDIO_ES );
 }
 
 /*
@@ -366,12 +355,14 @@ libvlc_track_description_t *
  */
 int libvlc_audio_get_track( libvlc_media_player_t *p_mi )
 {
-input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
-if( !p_input_thread )
-return -1;
+vlc_player_t *player = p_mi->player;
+vlc_player_Lock(player);
 
-int id = var_GetInteger( p_input_thread, "audio-es" );
-input_Release(p_input_thread);
+const struct vlc_player_track *track =
+vlc_player_GetSelectedTrack(player, AUDIO_ES);
+int id = track ? vlc_es_id_GetInputId(track->es_id) : -1;
+
+vlc_player_Unlock(player);
 return id;
 }
 
@@ -380,30 +371,27 @@ int libvlc_audio_get_track( libvlc_media_player_t *p_mi )
  */
 int libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track )
 {
-input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi );
-vlc_value_t *val_list;
-size_t count;
 int i_ret = -1;
 
-if( !p_input_thread )
-return -1;
+vlc_player_t *player = p_mi->player;
+vlc_player_Lock(player);
 
-var_Change( p_input_thread, "audio-es", VLC_VAR_GETCHOICES,
-, _list, (char ***)NULL );
+size_t count = vlc_player_GetAudioTrackCount(player);
 for( size_t i = 0; i < count; i++ )
 {
-if( i_track == val_list[i].i_int )
+const struct vlc_player_track *track =
+vlc_player_GetAudioTrackAt(player, i);
+if (i_track == vlc_es_id_GetInputId(track->es_id))
 {
-if( var_SetInteger( p_input_thread, "audio-es", i_track ) < 0 )
-break;
+/* found */
+vlc_player_SelectTrack(player, track->es_id);
 i_ret = 0;
 goto end;
 }
 }
 libvlc_printerr( "Track identifier not found" );
 end:
-free( val_list );
-input_Release(p_input_thread);
+vlc_player_Unlock(player);
 return i_ret;
 }
 
@@ -446,14 +434,14 @@ int libvlc_audio_set_channel( libvlc_media_player_t *mp, 
int channel )
  

[vlc-commits] libvlc: player: rename stop() to stop_async()

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Fri May 17 12:56:23 
2019 +0200| [80a8553e8a823f47bb6940cf788b79602fc5349b] | committer: 
Jean-Baptiste Kempf

libvlc: player: rename stop() to stop_async()

The new player stops asynchronously. This is a breaking change, so use a
different function name.

Signed-off-by: Jean-Baptiste Kempf 

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

 doc/libvlc/QtPlayer/player.cpp | 2 +-
 doc/libvlc/d3d11_player.cpp| 2 +-
 doc/libvlc/d3d9_player.c   | 2 +-
 doc/libvlc/gtk_player.c| 2 +-
 doc/libvlc/vlc-thumb.c | 2 +-
 doc/libvlc/wx_player.cpp   | 2 +-
 include/vlc/libvlc_media.h | 2 --
 include/vlc/libvlc_media_list_player.h | 2 +-
 include/vlc/libvlc_media_player.h  | 2 +-
 lib/libvlc.sym | 4 ++--
 lib/media_list_player.c| 4 ++--
 lib/media_player.c | 2 +-
 test/libvlc/media_list_player.c| 4 ++--
 test/libvlc/media_player.c | 6 +++---
 14 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/doc/libvlc/QtPlayer/player.cpp b/doc/libvlc/QtPlayer/player.cpp
index 6a25564c62..b1316026ba 100644
--- a/doc/libvlc/QtPlayer/player.cpp
+++ b/doc/libvlc/QtPlayer/player.cpp
@@ -201,7 +201,7 @@ void Mwindow::updateInterface() { //Update interface and 
check if song is finish
 void Mwindow::stop() {
 if(vlcPlayer) {
 /* stop the media player */
-libvlc_media_player_stop(vlcPlayer);
+libvlc_media_player_stop_async(vlcPlayer);
 
 /* release the media player */
 libvlc_media_player_release(vlcPlayer);
diff --git a/doc/libvlc/d3d11_player.cpp b/doc/libvlc/d3d11_player.cpp
index a739730455..a287afbb4e 100644
--- a/doc/libvlc/d3d11_player.cpp
+++ b/doc/libvlc/d3d11_player.cpp
@@ -470,7 +470,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
 }
 }
 
-libvlc_media_player_stop( p_mp );
+libvlc_media_player_stop_async( p_mp );
 
 libvlc_media_player_release( p_mp );
 libvlc_media_release( p_media );
diff --git a/doc/libvlc/d3d9_player.c b/doc/libvlc/d3d9_player.c
index 043fca777f..980bd1dff9 100644
--- a/doc/libvlc/d3d9_player.c
+++ b/doc/libvlc/d3d9_player.c
@@ -368,7 +368,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
 break;
 }
 
-libvlc_media_player_stop( p_mp );
+libvlc_media_player_stop_async( p_mp );
 
 libvlc_media_player_release( p_mp );
 libvlc_media_release( p_media );
diff --git a/doc/libvlc/gtk_player.c b/doc/libvlc/gtk_player.c
index 8196476249..9369b940ff 100644
--- a/doc/libvlc/gtk_player.c
+++ b/doc/libvlc/gtk_player.c
@@ -62,7 +62,7 @@ void on_playpause(GtkWidget *widget, gpointer data) {
 
 void on_stop(GtkWidget *widget, gpointer data) {
 pause_player();
-libvlc_media_player_stop(media_player);
+libvlc_media_player_stop_async(media_player);
 }
 
 void play(void) {
diff --git a/doc/libvlc/vlc-thumb.c b/doc/libvlc/vlc-thumb.c
index 7cb5aaafcc..a63307379c 100644
--- a/doc/libvlc/vlc-thumb.c
+++ b/doc/libvlc/vlc-thumb.c
@@ -217,7 +217,7 @@ int main(int argc, const char **argv)
 set_position(mp);
 snapshot(mp, width, out_with_ext);
 
-libvlc_media_player_stop(mp);
+libvlc_media_player_stop_async(mp);
 
 /* clean up */
 if (out != out_with_ext) {
diff --git a/doc/libvlc/wx_player.cpp b/doc/libvlc/wx_player.cpp
index a1690ce3ca..c2e6d8bfa8 100644
--- a/doc/libvlc/wx_player.cpp
+++ b/doc/libvlc/wx_player.cpp
@@ -222,7 +222,7 @@ void MainWindow::pause() {
 
 void MainWindow::stop() {
 pause();
-libvlc_media_player_stop(media_player);
+libvlc_media_player_stop_async(media_player);
 stop_button->Enable(false);
 setTimeline(0.0);
 timeline->Enable(false);
diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
index 4bc6f924ef..7b5acc0b24 100644
--- a/include/vlc/libvlc_media.h
+++ b/include/vlc/libvlc_media.h
@@ -348,8 +348,6 @@ typedef int (*libvlc_media_open_cb)(void *opaque, void 
**datap,
  *
  * \note If no data is immediately available, then the callback should sleep.
  * \warning The application is responsible for avoiding deadlock situations.
- * In particular, the callback should return an error if playback is stopped;
- * if it does not return, then libvlc_media_player_stop() will never return.
  */
 typedef ssize_t (*libvlc_media_read_cb)(void *opaque, unsigned char *buf,
 size_t len);
diff --git a/include/vlc/libvlc_media_list_player.h 
b/include/vlc/libvlc_media_list_player.h
index 8dcdcb961a..4fb7f31f50 100644
--- a/include/vlc/libvlc_media_list_player.h
+++ b/include/vlc/libvlc_media_list_player.h
@@ -197,7 +197,7 @@ int 
libvlc_media_list_player_play_item(libvlc_media_list_player_t * p_mlp,
  * \param p_mlp media list player instance
  */
 LIBVLC_API void
-libvlc_media_list_player_stop( libvlc_media_list_player_t * p_mlp);
+

[vlc-commits] libvlc: player: remove will_play()

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Thu May  9 16:49:43 
2019 +0200| [de3727296e3e67b80598a76e19e951bc823abdbd] | committer: 
Jean-Baptiste Kempf

libvlc: player: remove will_play()

This function is meaningless on the new player.

Signed-off-by: Jean-Baptiste Kempf 

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

 include/vlc/libvlc_media_player.h |  8 
 lib/libvlc.sym|  1 -
 lib/media_player.c| 13 -
 3 files changed, 22 deletions(-)

diff --git a/include/vlc/libvlc_media_player.h 
b/include/vlc/libvlc_media_player.h
index 0df3c0bcc7..27f34ab239 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1177,14 +1177,6 @@ LIBVLC_API int libvlc_media_player_get_chapter( 
libvlc_media_player_t *p_mi );
 LIBVLC_API int libvlc_media_player_get_chapter_count( libvlc_media_player_t 
*p_mi );
 
 /**
- * Is the player able to play
- *
- * \param p_mi the Media Player
- * \retval boolean
- */
-LIBVLC_API int libvlc_media_player_will_play( libvlc_media_player_t *p_mi );
-
-/**
  * Get title chapter count
  *
  * \param p_mi the Media Player
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 456f9c22e3..ca115fb7b1 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -178,7 +178,6 @@ libvlc_media_player_set_time
 libvlc_media_player_set_title
 libvlc_media_player_set_xwindow
 libvlc_media_player_stop
-libvlc_media_player_will_play
 libvlc_media_player_navigate
 libvlc_media_player_set_video_title_display
 libvlc_media_release
diff --git a/lib/media_player.c b/lib/media_player.c
index 35640b3e85..ca65556cc3 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -1776,19 +1776,6 @@ void libvlc_media_player_previous_chapter( 
libvlc_media_player_t *p_mi )
 input_Release(p_input_thread);
 }
 
-int libvlc_media_player_will_play( libvlc_media_player_t *p_mi )
-{
-input_thread_t *p_input_thread =
-libvlc_get_input_thread ( p_mi );
-if ( !p_input_thread )
-return false;
-
-int state = var_GetInteger( p_input_thread, "state" );
-input_Release(p_input_thread);
-
-return state != END_S && state != ERROR_S;
-}
-
 int libvlc_media_player_set_rate( libvlc_media_player_t *p_mi, float rate )
 {
 var_SetFloat (p_mi, "rate", rate);

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

[vlc-commits] player: add on_device_changed callback

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Mon May  6 15:08:54 
2019 +0200| [fb5b4934df98701e76003f9c98367e662775181f] | committer: 
Jean-Baptiste Kempf

player: add on_device_changed callback

Expose the "device" event on the aout via a player callback.

Signed-off-by: Jean-Baptiste Kempf 

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

 include/vlc_player.h |  9 +
 src/input/player.c   | 11 +++
 2 files changed, 20 insertions(+)

diff --git a/include/vlc_player.h b/include/vlc_player.h
index d4c49fa89d..054c4abae3 100644
--- a/include/vlc_player.h
+++ b/include/vlc_player.h
@@ -944,6 +944,15 @@ struct vlc_player_aout_cbs
  */
 void (*on_mute_changed)(vlc_player_t *player,
 bool new_muted, void *data);
+
+/**
+ * Called when the audio device has changed
+ *
+ * @param player unlocked player instance
+ * @param device the device name
+ */
+void (*on_device_changed)(vlc_player_t *player, const char *device,
+  void *data);
 };
 
 /**
diff --git a/src/input/player.c b/src/input/player.c
index e01701ba65..e81c717f36 100644
--- a/src/input/player.c
+++ b/src/input/player.c
@@ -3044,6 +3044,15 @@ vlc_player_AoutCallback(vlc_object_t *this, const char 
*var,
 vlc_player_vout_OSDVolume(player, true);
 }
 }
+else if (strcmp(var, "device") == 0)
+{
+const char *old = oldval.psz_string;
+const char *new = newval.psz_string;
+/* support NULL values for string comparison */
+if (old != new && (!old || !new || strcmp(old, new)))
+vlc_player_aout_SendEvent(player, on_device_changed,
+  newval.psz_string);
+}
 else
 vlc_assert_unreachable();
 
@@ -3513,6 +3522,7 @@ vlc_player_New(vlc_object_t *parent, enum 
vlc_player_lock_type lock_type,
 {
 var_AddCallback(aout, "volume", vlc_player_AoutCallback, player);
 var_AddCallback(aout, "mute", vlc_player_AoutCallback, player);
+var_AddCallback(aout, "device", vlc_player_AoutCallback, player);
 var_AddCallback(player, "corks", vlc_player_CorkCallback, NULL);
 input_resource_PutAout(player->resource, aout);
 }
@@ -3534,6 +3544,7 @@ error:
 {
 var_DelCallback(aout, "volume", vlc_player_AoutCallback, player);
 var_DelCallback(aout, "mute", vlc_player_AoutCallback, player);
+var_DelCallback(aout, "device", vlc_player_AoutCallback, player);
 var_DelCallback(player, "corks", vlc_player_AoutCallback, NULL);
 }
 if (player->resource)

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

[vlc-commits] randomizer: fix typos

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Fri May 17 15:08:52 
2019 +0200| [519877e327bb86aba1f4861412792c63248564d6] | committer: 
Jean-Baptiste Kempf

randomizer: fix typos

Signed-off-by: Jean-Baptiste Kempf 

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

 src/playlist/randomizer.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/playlist/randomizer.c b/src/playlist/randomizer.c
index 3bd320d016..5c22a55486 100644
--- a/src/playlist/randomizer.c
+++ b/src/playlist/randomizer.c
@@ -58,7 +58,7 @@
  * To achieve these goals, a "randomizer" stores a single vector containing all
  * the items of the playlist, along with 3 indexes.
  *
- * The whole vector is not shuffled at once: instead, steps of the Fish-Yates
+ * The whole vector is not shuffled at once: instead, steps of the Fisher-Yates
  * algorithm are executed one-by-one on demand. This has several advantages:
  *  - on insertions and removals, there is no need to reshuffle or shift the
  *whole array;
@@ -118,7 +118,7 @@
  *determinated range
  *
  * The playlist calls _Next() one more time. The randomizer selects C (already
- * in place). _Next() returns E.
+ * in place). _Next() returns C.
  *
  *  history
  *next  |
@@ -129,7 +129,7 @@
  * determinated range
  *
  * The playlist then calls _Prev(). Since the "current" item is C, the previous
- * one is E, so  _Prev() returns E, and 'next' moves back.
+ * one is E, so _Prev() returns E, and 'next' moves back.
  *
  *  history
  *   next   |
@@ -172,8 +172,8 @@
  *  determinated range
  *
  * At this point, if loop is disabled, it is not possible to call _Next()
- * anymore (_HasNext() returns false). So let's enable it by _SetLoop(), and
- * call _Next() again.
+ * anymore (_HasNext() returns false). So let's enable it by calling
+ * _SetLoop(), then let's call _Next() again.
  *
  * This will start a new loop cycle. Firstly, 'next' and 'head' are reset, and
  * the whole vector belongs to the last cycle history.

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

[vlc-commits] randomizer: fix history cursor on removal

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Thu May 16 12:32:55 
2019 +0200| [ea87e768e2965e8830ce36f2ee584b7d41e9bead] | committer: 
Jean-Baptiste Kempf

randomizer: fix history cursor on removal

randomizer_RemoveAt() did not manage the 'history' cursor correctly: it
explicitly tested "r->history == 0", which meant "no history" in
an earlier implementation, but not anymore.

Signed-off-by: Jean-Baptiste Kempf 

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

 src/playlist/randomizer.c | 22 --
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/playlist/randomizer.c b/src/playlist/randomizer.c
index 2da77b84fd..388cc02139 100644
--- a/src/playlist/randomizer.c
+++ b/src/playlist/randomizer.c
@@ -483,7 +483,7 @@ randomizer_RemoveAt(struct randomizer *r, size_t index)
  *orderedorder irrelevant   ordered
  */
 
-/* update next before may be updated */
+/* update next before index may be updated */
 if (index < r->next)
 r->next--;
 
@@ -497,26 +497,20 @@ randomizer_RemoveAt(struct randomizer *r, size_t index)
 index = r->head; /* the new index to remove */
 }
 
-if (!r->history || index < r->history)
+if (index < r->history)
 {
-size_t swap = (r->history + r->items.size - 1) % r->items.size;
-r->items.data[index] = r->items.data[swap];
-index = swap;
+/* this part is unordered, no need to shift all items */
+r->items.data[index] = r->items.data[r->history - 1];
+index = r->history - 1;
+r->history--;
 }
 
-if (r->history)
+if (index < r->items.size - 1)
 {
+/* shift the ordered history part by one */
 memmove(>items.data[index],
 >items.data[index + 1],
 (r->items.size - index - 1) * sizeof(*r->items.data));
-
-if (index < r->history)
-r->history--;
-else if (r->history == r->items.size)
-r->history = 0;
-
-if (r->next == r->items.size)
-r->next = 0;
 }
 
 r->items.size--;

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

[vlc-commits] randomizer: add unit test for loop mode

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Thu May 16 12:38:08 
2019 +0200| [c1625943f100ac389641e1a8760c3544fde26dba] | committer: 
Jean-Baptiste Kempf

randomizer: add unit test for loop mode

Test that additions and removals behave correctly in loop mode.

Signed-off-by: Jean-Baptiste Kempf 

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

 src/playlist/randomizer.c | 80 +++
 1 file changed, 80 insertions(+)

diff --git a/src/playlist/randomizer.c b/src/playlist/randomizer.c
index 388cc02139..3bd320d016 100644
--- a/src/playlist/randomizer.c
+++ b/src/playlist/randomizer.c
@@ -769,6 +769,85 @@ test_cycle_after_manual_selection(void)
 }
 
 static void
+test_cycle_with_additions_and_removals(void)
+{
+struct randomizer randomizer;
+randomizer_Init();
+randomizer_SetLoop(, true);
+
+#define SIZE 100
+vlc_playlist_item_t *items[SIZE];
+ArrayInit(items, SIZE);
+
+bool ok = randomizer_Add(, items, 80);
+assert(ok);
+
+for (int i = 0; i < 30; ++i)
+{
+assert(randomizer_HasNext());
+vlc_playlist_item_t *item = randomizer_Next();
+assert(item);
+}
+
+vlc_playlist_item_t *to_remove[20];
+/* copy 10 items already selected */
+memcpy(to_remove, [15], 10 * sizeof(*to_remove));
+/* copy 10 items not already selected */
+memcpy(_remove[10], [60], 10 * 
sizeof(*to_remove));
+
+randomizer_Remove(, to_remove, 20);
+
+/* it remains 40 items in the first cycle (30 already selected, and 10
+ * removed from the 50 remaining) */
+for (int i = 0; i < 40; ++i)
+{
+assert(randomizer_HasNext());
+vlc_playlist_item_t *item = randomizer_Next();
+assert(item);
+}
+
+/* the first cycle is complete */
+assert(randomizer_HasNext());
+/* force the determination of the first item of the next cycle */
+vlc_playlist_item_t *item = randomizer_PeekNext();
+assert(item);
+
+assert(randomizer.items.size == 60);
+assert(randomizer.history == 1);
+
+/* save current history */
+vlc_playlist_item_t *history[59];
+memcpy(history, [1], 59 * sizeof(*history));
+
+/* insert 20 new items */
+ok = randomizer_Add(, [80], 20);
+assert(ok);
+
+assert(randomizer.items.size == 80);
+assert(randomizer.history == 21);
+
+for (int i = 0; i < 59; ++i)
+assert(history[i] == randomizer.items.data[21 + i]);
+
+/* remove 10 items in the history part */
+memcpy(to_remove, [30], 10 * sizeof(*to_remove));
+randomizer_Remove(, to_remove, 10);
+
+assert(randomizer.items.size == 70);
+assert(randomizer.history == 21);
+
+/* the other items in the history must be kept in order */
+for (int i = 0; i < 9; ++i)
+assert(history[i] == randomizer.items.data[21 + i]);
+for (int i = 0; i < 40; ++i)
+assert(history[i + 19] == randomizer.items.data[30 + i]);
+
+ArrayDestroy(items, SIZE);
+randomizer_Destroy();
+#undef SIZE
+}
+
+static void
 test_force_select_new_item(void)
 {
 struct randomizer randomizer;
@@ -1137,6 +1216,7 @@ int main(void)
 test_all_items_selected_exactly_once_with_additions();
 test_all_items_selected_exactly_once_with_removals();
 test_cycle_after_manual_selection();
+test_cycle_with_additions_and_removals();
 test_force_select_new_item();
 test_force_select_item_already_selected();
 test_prev();

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

[vlc-commits] randomizer: fix history cursor on insertion

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Wed May 15 16:22:08 
2019 +0200| [ceebb7128ad9e00bf631be1c4f2e2defdd57ef8c] | committer: 
Jean-Baptiste Kempf

randomizer: fix history cursor on insertion

New items must always be added _before_ the 'history' cursor, so they
will always move it to the right.

The confusion came from an earlier implementation, where "history == 0"
was synonymous with "no history" (and it was not possible to consider
the whole array as history).

Fixes #22305

Signed-off-by: Jean-Baptiste Kempf 

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

 src/playlist/randomizer.c | 19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/playlist/randomizer.c b/src/playlist/randomizer.c
index 1490caa9a9..1bbf14c55b 100644
--- a/src/playlist/randomizer.c
+++ b/src/playlist/randomizer.c
@@ -423,18 +423,13 @@ randomizer_Next(struct randomizer *r)
 bool
 randomizer_Add(struct randomizer *r, vlc_playlist_item_t *items[], size_t 
count)
 {
-if (r->history)
-{
-if (!vlc_vector_insert_all(>items, r->history, items, count))
-return false;
-/* the insertion shifted history (and possibly next) */
-if (r->next > r->history)
-r->next += count;
-r->history += count;
-return true;
-}
-
-return vlc_vector_push_all(>items, items, count);
+if (!vlc_vector_insert_all(>items, r->history, items, count))
+return false;
+/* the insertion shifted history (and possibly next) */
+if (r->next > r->history)
+r->next += count;
+r->history += count;
+return true;
 }
 
 static void

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

[vlc-commits] playlist: update the randomizer on media change

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Thu May 16 13:02:52 
2019 +0200| [d5c1b16b557ed657541ce7aa664b4ba8a87c510c] | committer: 
Jean-Baptiste Kempf

playlist: update the randomizer on media change

When the player notifies that the current media has changed, it must be
considered "selected" by the randomizer.

Otherwise, when the player requests the next media to play, the playlist
will always "peek" the same next item from the randomizer, which will
never actually "select" it.

Signed-off-by: Jean-Baptiste Kempf 

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

 src/playlist/player.c | 15 +--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/playlist/player.c b/src/playlist/player.c
index bbdc39ba0e..6ca6ea0636 100644
--- a/src/playlist/player.c
+++ b/src/playlist/player.c
@@ -48,8 +48,19 @@ player_on_current_media_changed(vlc_player_t *player, 
input_item_t *new_media,
 /* nothing to do */
 return;
 
-ssize_t index = new_media ? vlc_playlist_IndexOfMedia(playlist, new_media)
-  : -1;
+ssize_t index;
+if (new_media)
+{
+index = vlc_playlist_IndexOfMedia(playlist, new_media);
+if (index != -1)
+{
+vlc_playlist_item_t *item = playlist->items.data[index];
+if (playlist->order == VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM)
+randomizer_Select(>randomizer, item);
+}
+}
+else
+index = -1;
 
 struct vlc_playlist_state state;
 vlc_playlist_state_Save(playlist, );

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

[vlc-commits] randomizer: use constant in test

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Wed May 15 17:21:33 
2019 +0200| [f729a6b965fc1a8c7bb11d4e503d032f196c37e3] | committer: 
Jean-Baptiste Kempf

randomizer: use constant in test

Signed-off-by: Jean-Baptiste Kempf 

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

 src/playlist/randomizer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/playlist/randomizer.c b/src/playlist/randomizer.c
index 1bb7f9e685..1490caa9a9 100644
--- a/src/playlist/randomizer.c
+++ b/src/playlist/randomizer.c
@@ -704,7 +704,7 @@ test_all_items_selected_exactly_once_with_removals(void)
 vlc_playlist_item_t *items[SIZE];
 ArrayInit(items, SIZE);
 
-bool ok = randomizer_Add(, items, 100);
+bool ok = randomizer_Add(, items, SIZE);
 assert(ok);
 
 bool selected[SIZE] = {0};

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

[vlc-commits] randomizer: add unit test for history cursor

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Wed May 15 17:22:08 
2019 +0200| [bc4180a05d9b2fc438099bd40efc0a05ab7ab18e] | committer: 
Jean-Baptiste Kempf

randomizer: add unit test for history cursor

This will avoid regression of bug #22305.

Signed-off-by: Jean-Baptiste Kempf 

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

 src/playlist/randomizer.c | 32 
 1 file changed, 32 insertions(+)

diff --git a/src/playlist/randomizer.c b/src/playlist/randomizer.c
index 1bbf14c55b..2da77b84fd 100644
--- a/src/playlist/randomizer.c
+++ b/src/playlist/randomizer.c
@@ -744,6 +744,37 @@ test_all_items_selected_exactly_once_with_removals(void)
 }
 
 static void
+test_cycle_after_manual_selection(void)
+{
+struct randomizer randomizer;
+randomizer_Init();
+randomizer_SetLoop(, true);
+
+#define SIZE 100
+vlc_playlist_item_t *items[SIZE];
+ArrayInit(items, SIZE);
+
+bool ok = randomizer_Add(, items, 100);
+assert(ok);
+
+/* force selection of the first item */
+randomizer_Select(, randomizer.items.data[0]);
+
+for (int i = 0; i < 2 * SIZE; ++i)
+{
+assert(randomizer_HasNext());
+vlc_playlist_item_t *item = randomizer_Next();
+assert(item);
+}
+
+assert(randomizer_HasNext()); /* still has items in loop */
+
+ArrayDestroy(items, SIZE);
+randomizer_Destroy();
+#undef SIZE
+}
+
+static void
 test_force_select_new_item(void)
 {
 struct randomizer randomizer;
@@ -,6 +1142,7 @@ int main(void)
 test_all_items_selected_exactly_once_per_cycle();
 test_all_items_selected_exactly_once_with_additions();
 test_all_items_selected_exactly_once_with_removals();
+test_cycle_after_manual_selection();
 test_force_select_new_item();
 test_force_select_item_already_selected();
 test_prev();

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

[vlc-commits] qt: fix nullptr dereference

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Wed May 15 15:28:22 
2019 +0200| [3f659b04f6fb31844a929423b8844f725eb2d6ab] | committer: 
Jean-Baptiste Kempf

qt: fix nullptr dereference

Do not dereference new_media when it is NULL.

Signed-off-by: Jean-Baptiste Kempf 

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

 modules/gui/qt/components/player_controller.cpp | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/gui/qt/components/player_controller.cpp 
b/modules/gui/qt/components/player_controller.cpp
index e42f7b5b9d..c37ce20e17 100644
--- a/modules/gui/qt/components/player_controller.cpp
+++ b/modules/gui/qt/components/player_controller.cpp
@@ -196,6 +196,11 @@ static  void on_player_current_media_changed(vlc_player_t 
*, input_item_t *new_m
 {
 PlayerControllerPrivate* that = 
static_cast(data);
 msg_Dbg( that->p_intf, "on_player_current_media_changed");
+
+if (!new_media)
+emit that->q_func()->inputChanged(false);
+return;
+
 InputItemPtr newMediaPtr = InputItemPtr( new_media );
 that->callAsync([that,newMediaPtr] () {
 PlayerController* q = that->q_func();
@@ -205,7 +210,7 @@ static  void on_player_current_media_changed(vlc_player_t 
*, input_item_t *new_m
 
 RecentsMRL::getInstance( that->p_intf )->addRecent( 
newMediaPtr.get()->psz_uri );
 
-emit q->inputChanged( newMediaPtr != nullptr );
+emit q->inputChanged(true);
 });
 }
 

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

[vlc-commits] randomizer: fix typo

[Romain Vimont]

vlc | branch: master | Romain Vimont  | Wed May 15 15:52:48 
2019 +0200| [1647f5d14b5ed46274ea2ae8eaffe38669abc7cc] | committer: 
Jean-Baptiste Kempf

randomizer: fix typo

Signed-off-by: Jean-Baptiste Kempf 

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

 src/playlist/randomizer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/playlist/randomizer.c b/src/playlist/randomizer.c
index 6bdb0afe12..1bb7f9e685 100644
--- a/src/playlist/randomizer.c
+++ b/src/playlist/randomizer.c
@@ -160,7 +160,7 @@
  *determinated range
  *
  * The playlist calls _Next(), the randomizer selects the last item (it has no
- * choice). 'next' and 'head' now points one item past the end (their value is
+ * choice). 'next' and 'head' now point one item past the end (their value is
  * the vector size).
  *
  *  history

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

[vlc-commits] codec: substx3g: improve quicktime text media styling

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 22 
19:45:07 2019 +0200| [887ad0be5e987efb6d10301335406eda64579b01] | committer: 
Francois Cartegnie

codec: substx3g: improve quicktime text media styling

refs BCDisassembly1RightSideTxt2.mov

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

 modules/codec/substx3g.c | 24 ++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/codec/substx3g.c b/modules/codec/substx3g.c
index 553c48e726..ebb650a0b8 100644
--- a/modules/codec/substx3g.c
+++ b/modules/codec/substx3g.c
@@ -487,20 +487,36 @@ static void ParseExtradataTextMedia( decoder_t *p_dec )
 return;
 
 /* DF @0 */
+uint32_t i_flags = GetDWBE(p_extra);
+if(i_flags & 0x1000) /* drop shadow */
+{
+p_style->i_style_flags |= STYLE_SHADOW;
+p_style->i_features|= 
STYLE_HAS_SHADOW_COLOR|STYLE_HAS_FLAGS|STYLE_HAS_SHADOW_ALPHA;
+p_style->i_shadow_color = 0xC0C0C0;
+p_style->i_shadow_alpha = STYLE_ALPHA_OPAQUE;
+}
+if(i_flags & 0x4000) /* key text*/
+{
+/*Controls background color. If this flag is set to 1, the text media 
handler does not display the
+  background color, so that the text overlay background tracks.*/
+p_style->i_style_flags &= ~STYLE_BACKGROUND;
+}
+
 /* Just @4 */
 
 /* BGColor @8, read top of 16 bits */
 p_style->i_background_color = (p_extra[8]  << 16) |
   (p_extra[10] <<  8) |
p_extra[12];
-p_style->i_features |= STYLE_HAS_BACKGROUND_COLOR;
+p_style->i_features |= STYLE_HAS_BACKGROUND_COLOR | 
STYLE_HAS_BACKGROUND_ALPHA;
+p_style->i_background_alpha = STYLE_ALPHA_OPAQUE;
 
 /* BoxRecord @14 */
 /* Reserved 64 @22 */
 /* Font # @30 */
 
 /* Font Face @32 */
-p_style->i_style_flags = ConvertToVLCFlags( GetWBE(_extra[32]) );
+p_style->i_style_flags |= ConvertToVLCFlags( GetWBE(_extra[32]) );
 if( p_style->i_style_flags )
 p_style->i_features |= STYLE_HAS_FLAGS;
 /* Reserved 8 @34 */
@@ -536,6 +552,10 @@ static int OpenDecoder( vlc_object_t *p_this )
 if( !p_dec->p_sys )
 return VLC_ENOMEM;
 
+text_style_t *p_default_style = p_dec->p_sys;
+p_default_style->i_style_flags |= STYLE_BACKGROUND;
+p_default_style->i_features |= STYLE_HAS_FLAGS;
+
 if( p_dec->fmt_in.i_codec == VLC_CODEC_TX3G )
 ParseExtradataTx3g( p_dec );
 else

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

[vlc-commits] demux: mp4: check extra before read

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 22 
19:10:07 2019 +0200| [e627b240e190f6692a08002865ac4b662fdcc7be] | committer: 
Francois Cartegnie

demux: mp4: check extra before read

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

 modules/demux/mp4/essetup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index 44ea84eb14..a7139667b0 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -1309,7 +1309,7 @@ int SetupSpuES( demux_t *p_demux, mp4_track_t *p_track, 
MP4_Box_t *p_sample )
 else
 p_track->fmt.i_codec = VLC_CODEC_TX3G;
 
-if( GetDWBE(p_text->p_data) & 0xC000 )
+if( p_text->i_data > 4 && GetDWBE(p_text->p_data) & 0xC000 )
 {
 p_track->fmt.i_priority = ES_PRIORITY_SELECTABLE_MIN + 1;
 p_track->b_forced_spu = true;

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

[vlc-commits] macosx: Update language list based on qt interface update

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
May 22 19:00:12 2019 +0200| [114144be5b2770649111d51914001707d54e97ec] | 
committer: David Fuhrmann

macosx: Update language list based on qt interface update

(cherry picked from commit 7e510968662a2940c41661c2fbc17e46013bead5)
Signed-off-by: David Fuhrmann 

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

 modules/gui/macosx/VLCSimplePrefsController.m | 27 ---
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/modules/gui/macosx/VLCSimplePrefsController.m 
b/modules/gui/macosx/VLCSimplePrefsController.m
index 8fa8d9383e..4aa95d3b61 100644
--- a/modules/gui/macosx/VLCSimplePrefsController.m
+++ b/modules/gui/macosx/VLCSimplePrefsController.m
@@ -54,13 +54,18 @@ static struct {
 { "auto",  N_("Auto"),  NO },
 { "en","American English",  NO },
 { "ar","عربي",  YES },
-{ "bn","বাংলা",  NO },
+{ "an","Aragonés",  NO },
+{ "as_IN", "অসমীয়া", NO },
+{ "ast",   "Asturianu", NO },
+{ "be","беларуская мова",   NO },
+{ "brx",   "बर'/बड़", NO },
+{ "bn","বাংলা",   NO },
 { "pt_BR", "Português Brasileiro",  NO },
 { "en_GB", "British English",   NO },
 { "el","Νέα Ελληνικά",  NO },
 { "bg","български език",NO },
 { "ca","Català",NO },
-{ "zh_TW", "正體中文",   NO },
+{ "zh_TW", "正體中文",NO },
 { "cs","Čeština",   NO },
 { "cy","Cymraeg",   NO },
 { "da","Dansk", NO },
@@ -72,19 +77,20 @@ static struct {
 { "ga","Gaeilge",   NO },
 { "gd","Gàidhlig",  NO },
 { "gl","Galego",NO },
-{ "ka","ქართული",   NO },
+{ "gu","ગુજરાતી", NO },
 { "de","Deutsch",   NO },
-{ "he","עברית",  YES },
+{ "he","עברית", YES },
 { "hr","hrvatski",  NO },
+{ "kn","ಕನ್ನಡ",   NO },
+{ "lv","Latviešu valoda",   NO },
 { "hu","Magyar",NO },
-{ "hy","հայերեն",NO },
+{ "mr","मराठी",   NO },
 { "is","íslenska",  NO },
 { "id","Bahasa Indonesia",  NO },
 { "it","Italiano",  NO },
 { "ja","日本語", NO },
 { "ko","한국어",  NO },
 { "lt","lietuvių",  NO },
-{ "mn","Монгол хэл",NO },
 { "ms","Melayu",NO },
 { "nb","Bokmål",NO },
 { "nn","Nynorsk",   NO },
@@ -92,21 +98,20 @@ static struct {
 { "km","ភាសាខ្មែរ",NO },
 { "ne","नेपाली",  NO },
 { "oc","Occitan",   NO },
-{ "fa","فارسی", YES },
 { "pl","Polski",NO },
 { "pt_PT", "Português", NO },
 { "pa","ਪੰਜਾਬੀ",  NO },
 { "ro","Română",NO },
 { "ru","Русский",   NO },
-{ "zh_CN", "简体中文",   NO },
-{ "si","සිංහල",NO },
+{ "zh_CN", "简体中文",NO },
+{ "si","සිංහල",   NO },
 { "sr","српски",NO },
 { "sk","Slovensky", NO },
 { "sl","slovenščina",   NO },
-{ "ckb",   "کوردیی سۆرانی", YES },
 { "es","Español",   NO },
+{ "es","Español Mexicano",  NO },
 { "sv","Svenska",   NO },
-{ "te","తెలుగు", NO },
+{ "th","ภาษาไทย",   NO },
 { "tr","Türkçe",NO },
 { "uk","украї́нська мо́ва",   NO },
 { "vi","tiếng Việt",NO },

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

[vlc-commits] upnp: Use TARGET_OS_OSX to check for macOS

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
May 22 19:12:10 2019 +0200| [3581f922b49553ca5b466822be6c4d5ac5a6d15a] | 
committer: David Fuhrmann

upnp: Use TARGET_OS_OSX to check for macOS

TARGET_OS_MAC is actually true when building for iPhone as well,
therefore not usable in this case.

backport of 0669e8a3393e0f3325a950ef444cdc2bacaf65ed

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

 modules/services_discovery/upnp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/services_discovery/upnp.cpp 
b/modules/services_discovery/upnp.cpp
index 26152942ca..af036bda36 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -1546,7 +1546,7 @@ done:
 #include 
 #endif
 
-#if defined(TARGET_OS_MAC) && TARGET_OS_MAC
+#if defined(TARGET_OS_OSX) && TARGET_OS_OSX
 #include 
 #include 
 #include "vlc_charset.h"

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

[vlc-commits] macosx: Update language list based on qt interface update

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Wed May 22 
19:00:12 2019 +0200| [7e510968662a2940c41661c2fbc17e46013bead5] | committer: 
David Fuhrmann

macosx: Update language list based on qt interface update

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

 .../macosx/preferences/VLCSimplePrefsController.m  | 27 +-
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/modules/gui/macosx/preferences/VLCSimplePrefsController.m 
b/modules/gui/macosx/preferences/VLCSimplePrefsController.m
index e6712cf42a..0b6931587f 100644
--- a/modules/gui/macosx/preferences/VLCSimplePrefsController.m
+++ b/modules/gui/macosx/preferences/VLCSimplePrefsController.m
@@ -55,13 +55,18 @@ static struct {
 { "auto",  N_("Auto"),  NO },
 { "en","American English",  NO },
 { "ar","عربي",  YES },
-{ "bn","বাংলা",  NO },
+{ "an","Aragonés",  NO },
+{ "as_IN", "অসমীয়া", NO },
+{ "ast",   "Asturianu", NO },
+{ "be","беларуская мова",   NO },
+{ "brx",   "बर'/बड़", NO },
+{ "bn","বাংলা",   NO },
 { "pt_BR", "Português Brasileiro",  NO },
 { "en_GB", "British English",   NO },
 { "el","Νέα Ελληνικά",  NO },
 { "bg","български език",NO },
 { "ca","Català",NO },
-{ "zh_TW", "正體中文",   NO },
+{ "zh_TW", "正體中文",NO },
 { "cs","Čeština",   NO },
 { "cy","Cymraeg",   NO },
 { "da","Dansk", NO },
@@ -73,19 +78,20 @@ static struct {
 { "ga","Gaeilge",   NO },
 { "gd","Gàidhlig",  NO },
 { "gl","Galego",NO },
-{ "ka","ქართული",   NO },
+{ "gu","ગુજરાતી", NO },
 { "de","Deutsch",   NO },
-{ "he","עברית",  YES },
+{ "he","עברית", YES },
 { "hr","hrvatski",  NO },
+{ "kn","ಕನ್ನಡ",   NO },
+{ "lv","Latviešu valoda",   NO },
 { "hu","Magyar",NO },
-{ "hy","հայերեն",NO },
+{ "mr","मराठी",   NO },
 { "is","íslenska",  NO },
 { "id","Bahasa Indonesia",  NO },
 { "it","Italiano",  NO },
 { "ja","日本語", NO },
 { "ko","한국어",  NO },
 { "lt","lietuvių",  NO },
-{ "mn","Монгол хэл",NO },
 { "ms","Melayu",NO },
 { "nb","Bokmål",NO },
 { "nn","Nynorsk",   NO },
@@ -93,21 +99,20 @@ static struct {
 { "km","ភាសាខ្មែរ",NO },
 { "ne","नेपाली",  NO },
 { "oc","Occitan",   NO },
-{ "fa","فارسی", YES },
 { "pl","Polski",NO },
 { "pt_PT", "Português", NO },
 { "pa","ਪੰਜਾਬੀ",  NO },
 { "ro","Română",NO },
 { "ru","Русский",   NO },
-{ "zh_CN", "简体中文",   NO },
-{ "si","සිංහල",NO },
+{ "zh_CN", "简体中文",NO },
+{ "si","සිංහල",   NO },
 { "sr","српски",NO },
 { "sk","Slovensky", NO },
 { "sl","slovenščina",   NO },
-{ "ckb",   "کوردیی سۆرانی", YES },
 { "es","Español",   NO },
+{ "es","Español Mexicano",  NO },
 { "sv","Svenska",   NO },
-{ "te","తెలుగు", NO },
+{ "th","ภาษาไทย",   NO },
 { "tr","Türkçe",NO },
 { "uk","украї́нська мо́ва",   NO },
 { "vi","tiếng Việt",NO },

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

[vlc-commits] demux: mp4: fix EIA708 regression in quicktime

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 22 
17:50:18 2019 +0200| [027dd96f992b0a47c6f3593c0a18bd647d2e3b5b] | committer: 
Francois Cartegnie

demux: mp4: fix EIA708 regression in quicktime

ever seen one ?

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

 modules/demux/mp4/mp4.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 7d6899ef50..b3d1bc60bf 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -651,6 +651,7 @@ static block_t * MP4_Block_Convert( demux_t *p_demux, const 
mp4_track_t *p_track
 /* accept as-is */
 break;
 case VLC_CODEC_CEA608:
+case VLC_CODEC_CEA708:
 p_block = MP4_EIA608_Convert( p_block );
 break;
 default:

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

[vlc-commits] demux: mp4: fix regression with quicktime text spu

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 22 
17:46:26 2019 +0200| [5bd87b27816f8745b5a8f528dc6fac588deaec3f] | committer: 
Francois Cartegnie

demux: mp4: fix regression with quicktime text spu

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

 modules/demux/mp4/mp4.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index bccdfcf2aa..7d6899ef50 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -644,6 +644,7 @@ static block_t * MP4_Block_Convert( demux_t *p_demux, const 
mp4_track_t *p_track
 {
 case VLC_CODEC_WEBVTT:
 case VLC_CODEC_TTML:
+case VLC_CODEC_QTXT:
 case VLC_CODEC_TX3G:
 case VLC_CODEC_SPU:
 case VLC_CODEC_SUBT:

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

[vlc-commits] demux: mp4: exclude subt from metadata refs

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 22 
17:55:22 2019 +0200| [0c2fa69df3303106b6ae0f223988c2ab63770919] | committer: 
Francois Cartegnie

demux: mp4: exclude subt from metadata refs

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

 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 b3d1bc60bf..8a6fbdbc3b 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -251,7 +251,7 @@ static uint32_t stream_ReadU32( stream_t *s, void *p_read, 
uint32_t i_toread )
 
 static inline bool MP4_isMetadata(const mp4_track_t *tk)
 {
-return tk->as_reftype != 0;
+return tk->as_reftype != 0 && tk->as_reftype != ATOM_subt;
 }
 
 static MP4_Box_t * MP4_GetTrexByTrackID( MP4_Box_t *p_moov, const uint32_t 
i_id )

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

[vlc-commits] demux: mp4: ignore all referenced tracks

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 22 
16:41:33 2019 +0200| [f93fef718c3c61e2e4f5f9438d2e7f534e35bff9] | committer: 
Francois Cartegnie

demux: mp4: ignore all referenced tracks

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

 modules/demux/mp4/mp4.c | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 5794ee337f..bccdfcf2aa 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -249,9 +249,9 @@ static uint32_t stream_ReadU32( stream_t *s, void *p_read, 
uint32_t i_toread )
 return i_return;
 }
 
-static inline bool MP4_isChapter(const mp4_track_t *tk)
+static inline bool MP4_isMetadata(const mp4_track_t *tk)
 {
-return tk->as_reftype == ATOM_chap;
+return tk->as_reftype != 0;
 }
 
 static MP4_Box_t * MP4_GetTrexByTrackID( MP4_Box_t *p_moov, const uint32_t 
i_id )
@@ -1419,7 +1419,7 @@ static int DemuxMoov( demux_t *p_demux )
 mp4_track_t *tk = _sys->track[i_track];
 bool b = true;
 
-if( !tk->b_ok || MP4_isChapter( tk ) ||
+if( !tk->b_ok || MP4_isMetadata( tk ) ||
 ( tk->b_selected && tk->i_sample >= tk->i_sample_count ) )
 {
 continue;
@@ -1447,7 +1447,7 @@ static int DemuxMoov( demux_t *p_demux )
 for( i_track = 0; i_track < p_sys->i_tracks; i_track++ )
 {
 mp4_track_t *tk = _sys->track[i_track];
-if( !tk->b_ok || MP4_isChapter( tk ) || tk->i_sample >= 
tk->i_sample_count )
+if( !tk->b_ok || MP4_isMetadata( tk ) || tk->i_sample >= 
tk->i_sample_count )
 continue;
 /* Test for EOF on each track (samples count, edit list) */
 b_eof &= ( i_nztime > MP4_TrackGetDTS( p_demux, tk ) );
@@ -1468,7 +1468,7 @@ static int DemuxMoov( demux_t *p_demux )
 for( i_track = 0; i_track < p_sys->i_tracks; i_track++ )
 {
 mp4_track_t *tk_tmp = _sys->track[i_track];
-if( !tk_tmp->b_ok || MP4_isChapter( tk_tmp ) ||
+if( !tk_tmp->b_ok || MP4_isMetadata( tk_tmp ) ||
 tk_tmp->i_sample >= tk_tmp->i_sample_count ||
 (!tk_tmp->b_selected && p_sys->b_seekable) )
 continue;
@@ -1492,7 +1492,7 @@ static int DemuxMoov( demux_t *p_demux )
 {
 mp4_track_t *tk_tmp = _sys->track[i_track];
 if( tk_tmp == tk ||
-!tk_tmp->b_ok || MP4_isChapter( tk_tmp ) ||
+!tk_tmp->b_ok || MP4_isMetadata( tk_tmp ) ||
(!tk_tmp->b_selected && p_sys->b_seekable) ||
 tk_tmp->i_sample >= tk_tmp->i_sample_count )
 continue;
@@ -1579,7 +1579,7 @@ static int Seek( demux_t *p_demux, vlc_tick_t i_date, 
bool b_accurate )
 mp4_track_t *tk = _sys->track[i_track];
 /* FIXME: we should find the lowest time from tracks with indexes.
considering only video for now */
-if( tk->fmt.i_cat != VIDEO_ES || MP4_isChapter( tk ) || !tk->b_ok )
+if( tk->fmt.i_cat != VIDEO_ES || MP4_isMetadata( tk ) || !tk->b_ok )
 continue;
 if( MP4_TrackSeek( p_demux, tk, i_date ) == VLC_SUCCESS )
 {
@@ -3605,7 +3605,7 @@ static void MP4_TrackSetup( demux_t *p_demux, mp4_track_t 
*p_track,
 
 if( TrackCreateES( p_demux,
p_track, p_track->i_chunk,
-  (MP4_isChapter( p_track ) || !b_create_es) ? NULL : 
_track->p_es ) )
+  (MP4_isMetadata( p_track ) || !b_create_es) ? NULL : 
_track->p_es ) )
 {
 msg_Err( p_demux, "cannot create es for track[Id 0x%x]",
  p_track->i_track_ID );
@@ -3665,7 +3665,7 @@ static void MP4_TrackInit( mp4_track_t *p_track, const 
MP4_Box_t *p_trackbox )
 
 static void MP4_TrackSelect( demux_t *p_demux, mp4_track_t *p_track, bool 
b_select )
 {
-if( !p_track->b_ok || MP4_isChapter(p_track) )
+if( !p_track->b_ok || MP4_isMetadata(p_track) )
 return;
 
 if( b_select == p_track->b_selected )
@@ -3686,7 +3686,7 @@ static int MP4_TrackSeek( demux_t *p_demux, mp4_track_t 
*p_track,
 uint32_t i_chunk;
 uint32_t i_sample;
 
-if( !p_track->b_ok || MP4_isChapter( p_track ) )
+if( !p_track->b_ok || MP4_isMetadata( p_track ) )
 return VLC_EGENERIC;
 
 p_track->b_selected = false;
@@ -4555,7 +4555,7 @@ static int DemuxMoof( demux_t *p_demux )
 {
 mp4_track_t *tk_tmp = _sys->track[i];
 
-if( !tk_tmp->b_ok || MP4_isChapter( tk_tmp ) ||
+if( !tk_tmp->b_ok || MP4_isMetadata( tk_tmp ) ||
(!tk_tmp->b_selected && !p_sys->b_seekable) ||
 tk_tmp->context.runs.i_current >= tk_tmp->context.runs.i_count 
)
 continue;
@@ -4579,7 +4579,7 @@ static int DemuxMoof( demux_t *p_demux )
 {

[vlc-commits] demux: mp4: drop chap storage

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 22 
16:26:03 2019 +0200| [f079ce6732c297f44070f50f9efe1d33479dc882] | committer: 
Francois Cartegnie

demux: mp4: drop chap storage

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

 modules/demux/mp4/mp4.c | 51 +++--
 1 file changed, 11 insertions(+), 40 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 73178c6f28..5794ee337f 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -123,9 +123,6 @@ typedef struct
 } context;
 
 /* */
-MP4_Box_t*p_tref_chap;
-
-/* */
 bool seekpoint_changed;
 int  i_seekpoint;
 input_title_t *p_title;
@@ -984,9 +981,8 @@ static int Open( vlc_object_t * p_this )
 if( CreateTracks( p_demux, i_tracks ) != VLC_SUCCESS )
 goto error;
 
-/* Search the first chap reference (like quicktime) and
+/* set referenced tracks and
  * check that at least 1 stream is enabled */
-p_sys->p_tref_chap = NULL;
 b_enabled_es = false;
 for( unsigned i = 0; i < p_sys->i_tracks; i++ )
 {
@@ -1015,10 +1011,6 @@ static int Open( vlc_object_t * p_this )
 if(reftk)
 reftk->as_reftype = p_refbox->i_type;
 }
-
-/* Point chapter shortcut */
-if( p_refbox->i_type == ATOM_chap && !p_sys->p_tref_chap )
-p_sys->p_tref_chap = p_refbox;
 }
 }
 
@@ -2409,24 +2401,16 @@ static void LoadChapter( demux_t  *p_demux )
 {
 LoadChapterGoPro( p_demux, p_hmmt );
 }
-else if( p_sys->p_tref_chap )
+else
 {
-MP4_Box_data_trak_reference_t *p_chap = 
p_sys->p_tref_chap->data.p_track_reference;
-unsigned int i, j;
-
 /* Load the first subtitle track like quicktime */
-for( i = 0; i < p_chap->i_entry_count; i++ )
+for( unsigned i = 0; i < p_sys->i_tracks; i++ )
 {
-for( j = 0; j < p_sys->i_tracks; j++ )
-{
-mp4_track_t *tk = _sys->track[j];
-if( tk->b_ok && tk->i_track_ID == p_chap->i_track_ID[i] &&
-tk->fmt.i_cat == SPU_ES && tk->fmt.i_codec == 
VLC_CODEC_TX3G )
-break;
-}
-if( j < p_sys->i_tracks )
+mp4_track_t *tk = _sys->track[i];
+if(tk->b_ok && tk->as_reftype == ATOM_chap &&
+   tk->fmt.i_cat == SPU_ES && tk->fmt.i_codec == VLC_CODEC_TX3G)
 {
-LoadChapterApple( p_demux, _sys->track[j] );
+LoadChapterApple( p_demux, tk );
 break;
 }
 }
@@ -3556,23 +3540,10 @@ static void MP4_TrackSetup( demux_t *p_demux, 
mp4_track_t *p_track,
 p_track->i_chunk  = 0;
 p_track->i_sample = 0;
 
-/* Mark chapter only track */
-if( p_sys->p_tref_chap )
-{
-MP4_Box_data_trak_reference_t *p_chap = 
p_sys->p_tref_chap->data.p_track_reference;
-unsigned int i;
-
-for( i = 0; i < p_chap->i_entry_count; i++ )
-{
-if( p_track->i_track_ID == p_chap->i_track_ID[i] &&
-p_track->fmt.i_cat == UNKNOWN_ES )
-{
-p_track->as_reftype = ATOM_chap;
-p_track->b_enable = false;
-break;
-}
-}
-}
+/* Disable chapter only track */
+if( p_track->fmt.i_cat == UNKNOWN_ES &&
+p_track->as_reftype == ATOM_chap )
+p_track->b_enable = false;
 
 const MP4_Box_t *p_tsel;
 /* now create es */

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

[vlc-commits] demux: mp4: check chapters by track reference type

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 22 
13:37:06 2019 +0200| [95c46854b43db9793a10ec92467c287d6aaaf646] | committer: 
Francois Cartegnie

demux: mp4: check chapters by track reference type

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

 modules/demux/mp4/mp4.c | 39 ++-
 modules/demux/mp4/mp4.h |  2 +-
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 44da17ece4..7e31bd9436 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -252,6 +252,11 @@ static uint32_t stream_ReadU32( stream_t *s, void *p_read, 
uint32_t i_toread )
 return i_return;
 }
 
+static inline bool MP4_isChapter(const mp4_track_t *tk)
+{
+return tk->as_reftype == ATOM_chap;
+}
+
 static MP4_Box_t * MP4_GetTrexByTrackID( MP4_Box_t *p_moov, const uint32_t 
i_id )
 {
 if(!p_moov)
@@ -1008,7 +1013,7 @@ static int Open( vlc_object_t * p_this )
 MP4_Box_t *p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[%u]", i );
 MP4_TrackSetup( p_demux, _sys->track[i], p_trak, true, !b_enabled_es 
);
 
-if( p_sys->track[i].b_ok && !p_sys->track[i].b_chapters_source )
+if( p_sys->track[i].b_ok && !p_sys->track[i].as_reftype )
 {
 const char *psz_cat;
 switch( p_sys->track[i].fmt.i_cat )
@@ -1034,7 +1039,7 @@ static int Open( vlc_object_t * p_this )
  p_sys->track[i].fmt.psz_language ?
  p_sys->track[i].fmt.psz_language : "undef" );
 }
-else if( p_sys->track[i].b_ok && p_sys->track[i].b_chapters_source )
+else if( p_sys->track[i].b_ok && p_sys->track[i].as_reftype == 
ATOM_chap )
 {
 msg_Dbg( p_demux, "using track[Id 0x%x] for chapter language %s",
  p_sys->track[i].i_track_ID,
@@ -1301,7 +1306,7 @@ static int DemuxTrack( demux_t *p_demux, mp4_track_t *tk, 
uint64_t i_readpos,
 if( !tk->b_ok || tk->i_sample >= tk->i_sample_count )
 return VLC_DEMUXER_EOS;
 
-if( tk->b_chapters_source )
+if( tk->as_reftype == ATOM_chap )
 return VLC_DEMUXER_SUCCESS;
 
 uint32_t i_run_seq = MP4_TrackGetRunSeq( tk );
@@ -1403,7 +1408,7 @@ static int DemuxMoov( demux_t *p_demux )
 mp4_track_t *tk = _sys->track[i_track];
 bool b = true;
 
-if( !tk->b_ok || tk->b_chapters_source ||
+if( !tk->b_ok || MP4_isChapter( tk ) ||
 ( tk->b_selected && tk->i_sample >= tk->i_sample_count ) )
 {
 continue;
@@ -1431,7 +1436,7 @@ static int DemuxMoov( demux_t *p_demux )
 for( i_track = 0; i_track < p_sys->i_tracks; i_track++ )
 {
 mp4_track_t *tk = _sys->track[i_track];
-if( !tk->b_ok || tk->b_chapters_source || tk->i_sample >= 
tk->i_sample_count )
+if( !tk->b_ok || MP4_isChapter( tk ) || tk->i_sample >= 
tk->i_sample_count )
 continue;
 /* Test for EOF on each track (samples count, edit list) */
 b_eof &= ( i_nztime > MP4_TrackGetDTS( p_demux, tk ) );
@@ -1452,7 +1457,7 @@ static int DemuxMoov( demux_t *p_demux )
 for( i_track = 0; i_track < p_sys->i_tracks; i_track++ )
 {
 mp4_track_t *tk_tmp = _sys->track[i_track];
-if( !tk_tmp->b_ok || tk_tmp->b_chapters_source ||
+if( !tk_tmp->b_ok || MP4_isChapter( tk_tmp ) ||
 tk_tmp->i_sample >= tk_tmp->i_sample_count ||
 (!tk_tmp->b_selected && p_sys->b_seekable) )
 continue;
@@ -1476,7 +1481,7 @@ static int DemuxMoov( demux_t *p_demux )
 {
 mp4_track_t *tk_tmp = _sys->track[i_track];
 if( tk_tmp == tk ||
-!tk_tmp->b_ok || tk_tmp->b_chapters_source ||
+!tk_tmp->b_ok || MP4_isChapter( tk_tmp ) ||
(!tk_tmp->b_selected && p_sys->b_seekable) ||
 tk_tmp->i_sample >= tk_tmp->i_sample_count )
 continue;
@@ -1563,7 +1568,7 @@ static int Seek( demux_t *p_demux, vlc_tick_t i_date, 
bool b_accurate )
 mp4_track_t *tk = _sys->track[i_track];
 /* FIXME: we should find the lowest time from tracks with indexes.
considering only video for now */
-if( tk->fmt.i_cat != VIDEO_ES )
+if( tk->fmt.i_cat != VIDEO_ES || MP4_isChapter( tk ) || !tk->b_ok )
 continue;
 if( MP4_TrackSeek( p_demux, tk, i_date ) == VLC_SUCCESS )
 {
@@ -1580,7 +1585,7 @@ static int Seek( demux_t *p_demux, vlc_tick_t i_date, 
bool b_accurate )
 {
 mp4_track_t *tk = _sys->track[i_track];
 tk->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY;
-if( tk->fmt.i_cat == VIDEO_ES )
+if( tk->fmt.i_cat == VIDEO_ES || !tk->b_ok )
 continue;
 MP4_TrackSeek( p_demux, tk, i_start );
 }
@@ -3543,7 

[vlc-commits] demux: mp4: sync track ID from track creation

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 22 
15:44:51 2019 +0200| [eed996c58adf5f753d7a08fc80d07129c2a05077] | committer: 
Francois Cartegnie

demux: mp4: sync track ID from track creation

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

 modules/demux/mp4/mp4.c | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 7393be3f2d..44da17ece4 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -165,7 +165,7 @@ const char *psz_meta_roots[] = { "/moov/udta/meta/ilst",
  * Declaration of local function
  */
 static void MP4_TrackSetup( demux_t *, mp4_track_t *, MP4_Box_t  *, bool, bool 
);
-static void MP4_TrackInit( mp4_track_t * );
+static void MP4_TrackInit( mp4_track_t *, const MP4_Box_t * );
 static void MP4_TrackClean( es_out_t *, mp4_track_t * );
 
 static void MP4_Block_Send( demux_t *, mp4_track_t *, block_t * );
@@ -491,7 +491,10 @@ static int CreateTracks( demux_t *p_demux, unsigned 
i_tracks )
 p_sys->i_tracks = i_tracks;
 
 for( unsigned i=0; itrack[i] );
+{
+MP4_TrackInit( _sys->track[i],
+   MP4_BoxGet( p_sys->p_root, "/moov/trak[%d]", i ) );
+}
 
 return VLC_SUCCESS;
 }
@@ -3362,8 +3365,6 @@ static void MP4_TrackSetup( demux_t *p_demux, mp4_track_t 
*p_track,
 p_track->b_enable =
 ( ( BOXDATA(p_tkhd)->i_flags_TRACK_ENABLED ) != 0 );
 
-p_track->i_track_ID = BOXDATA(p_tkhd)->i_track_ID;
-
 p_track->i_width = BOXDATA(p_tkhd)->i_width / BLOCK16x16;
 p_track->i_height = BOXDATA(p_tkhd)->i_height / BLOCK16x16;
 p_track->f_rotation = BOXDATA(p_tkhd)->f_rotation;
@@ -3656,11 +3657,15 @@ static void MP4_TrackClean( es_out_t *out, mp4_track_t 
*p_track )
 free( p_track->context.runs.p_array );
 }
 
-static void MP4_TrackInit( mp4_track_t *p_track )
+static void MP4_TrackInit( mp4_track_t *p_track, const MP4_Box_t *p_trackbox )
 {
 memset( p_track, 0, sizeof(mp4_track_t) );
 es_format_Init( _track->fmt, UNKNOWN_ES, 0 );
 p_track->i_timescale = 1;
+p_track->p_track = p_trackbox;
+const MP4_Box_t *p_tkhd = MP4_BoxGet( p_trackbox, "tkhd" );
+if(likely(p_tkhd) && BOXDATA(p_tkhd))
+p_track->i_track_ID = BOXDATA(p_tkhd)->i_track_ID;
 }
 
 static void MP4_TrackSelect( demux_t *p_demux, mp4_track_t *p_track, bool 
b_select )

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

[vlc-commits] demux: mp4: tag all referenced tracks with their type

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 22 
15:10:30 2019 +0200| [6fd1fbf7582df806079a863773694f3a13ed22ab] | committer: 
Francois Cartegnie

demux: mp4: tag all referenced tracks with their type

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

 modules/demux/mp4/mp4.c | 29 -
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 7e31bd9436..73178c6f28 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -992,15 +992,34 @@ static int Open( vlc_object_t * p_this )
 {
 MP4_Box_t *p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[%d]", i );
 
-
+/* Enabled check as explained above */
 MP4_Box_t *p_tkhd = MP4_BoxGet( p_trak, "tkhd" );
 if( p_tkhd && BOXDATA(p_tkhd) && 
(BOXDATA(p_tkhd)->i_flags_TRACK_ENABLED) )
 b_enabled_es = true;
 
-MP4_Box_t *p_chap = MP4_BoxGet( p_trak, "tref/chap", i );
-if( p_chap && p_chap->data.p_track_reference &&
-p_chap->data.p_track_reference->i_entry_count > 0 && 
!p_sys->p_tref_chap )
-p_sys->p_tref_chap = p_chap;
+/* Referenced tracks checks */
+MP4_Box_t *p_tref = MP4_BoxGet( p_trak, "tref" );
+if(!p_tref)
+continue;
+
+for( MP4_Box_t *p_refbox = p_tref->p_first; p_refbox; p_refbox = 
p_refbox->p_next )
+{
+const MP4_Box_data_trak_reference_t *refdata = 
p_refbox->data.p_track_reference;
+if(unlikely(!refdata))
+continue;
+
+/* Assign reference types */
+for( uint32_t j = 0; j < refdata->i_entry_count; j++ )
+{
+mp4_track_t *reftk = MP4_GetTrackByTrackID(p_demux, 
refdata->i_track_ID[j]);
+if(reftk)
+reftk->as_reftype = p_refbox->i_type;
+}
+
+/* Point chapter shortcut */
+if( p_refbox->i_type == ATOM_chap && !p_sys->p_tref_chap )
+p_sys->p_tref_chap = p_refbox;
+}
 }
 
 /* Set and store metadata */

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

[vlc-commits] demux: libmp4: rework tref reading

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie  | Wed May 22 
14:43:00 2019 +0200| [e30acc033505a70fc088b790398c3bbcd34211dd] | committer: 
Francois Cartegnie

demux: libmp4: rework tref reading

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

 modules/demux/mp4/libmp4.c | 55 ++
 modules/demux/mp4/libmp4.h | 17 --
 modules/demux/mp4/mp4.c|  8 +++
 3 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 3b6f64a136..0471163576 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3741,37 +3741,62 @@ static int MP4_ReadBox_HMMT( stream_t *p_stream, 
MP4_Box_t *p_box )
 MP4_READBOX_EXIT( 1 );
 }
 
-static void MP4_FreeBox_tref_generic( MP4_Box_t *p_box )
+static void MP4_FreeBox_TrackReference( MP4_Box_t *p_box )
 {
-free( p_box->data.p_tref_generic->i_track_ID );
+free( p_box->data.p_track_reference->i_track_ID );
 }
 
-static int MP4_ReadBox_tref_generic( stream_t *p_stream, MP4_Box_t *p_box )
+static int MP4_ReadBox_TrackReference( stream_t *p_stream, MP4_Box_t *p_box )
 {
 uint32_t count;
 
-MP4_READBOX_ENTER( MP4_Box_data_tref_generic_t, MP4_FreeBox_tref_generic );
+MP4_READBOX_ENTER( MP4_Box_data_trak_reference_t, 
MP4_FreeBox_TrackReference );
 
-p_box->data.p_tref_generic->i_track_ID = NULL;
+p_box->data.p_track_reference->i_track_ID = NULL;
 count = i_read / sizeof(uint32_t);
-p_box->data.p_tref_generic->i_entry_count = count;
-p_box->data.p_tref_generic->i_track_ID = vlc_alloc( count,
+p_box->data.p_track_reference->i_entry_count = count;
+p_box->data.p_track_reference->i_track_ID = vlc_alloc( count,
 sizeof(uint32_t) );
-if( p_box->data.p_tref_generic->i_track_ID == NULL )
+if( p_box->data.p_track_reference->i_track_ID == NULL )
 MP4_READBOX_EXIT( 0 );
 
 for( unsigned i = 0; i < count; i++ )
 {
-MP4_GET4BYTES( p_box->data.p_tref_generic->i_track_ID[i] );
+MP4_GET4BYTES( p_box->data.p_track_reference->i_track_ID[i] );
 }
 #ifdef MP4_VERBOSE
 msg_Dbg( p_stream, "read box: \"chap\" %d references",
- p_box->data.p_tref_generic->i_entry_count );
+ p_box->data.p_track_reference->i_entry_count );
 #endif
 
 MP4_READBOX_EXIT( 1 );
 }
 
+static int MP4_ReadBox_tref( stream_t *p_stream, MP4_Box_t *p_box )
+{
+/* skip header */
+ssize_t i_header = mp4_box_headersize( p_box );
+if( vlc_stream_Read( p_stream, NULL, i_header ) != i_header )
+return 0;
+/* read each reference atom with forced handler */
+uint64_t i_remain = p_box->i_size - 8;
+while ( i_remain > 8 )
+{
+MP4_Box_t *p_childbox = MP4_ReadBoxUsing( p_stream, p_box,
+  MP4_ReadBox_TrackReference );
+if( !p_childbox || i_remain < p_childbox->i_size )
+{
+MP4_BoxFree( p_childbox );
+break;
+}
+
+MP4_BoxAddChild( p_box, p_childbox );
+i_remain -= p_childbox->i_size;
+}
+
+return MP4_Seek( p_stream, p_box->i_pos + p_box->i_size ) ? 0 : 1;
+}
+
 static void MP4_FreeBox_keys( MP4_Box_t *p_box )
 {
 for( uint32_t i=0; idata.p_keys->i_entry_count; i++ )
@@ -4760,7 +4785,7 @@ static const struct
 { ATOM_hnti,MP4_ReadBoxContainer, ATOM_udta },
 { ATOM_rmra,MP4_ReadBoxContainer, ATOM_moov },
 { ATOM_rmda,MP4_ReadBoxContainer, ATOM_rmra },
-{ ATOM_tref,MP4_ReadBoxContainer, ATOM_trak },
+{ ATOM_tref,MP4_ReadBox_tref, ATOM_trak },
 { ATOM_gmhd,MP4_ReadBoxContainer, ATOM_minf },
 { ATOM_wave,MP4_ReadBoxContainer, ATOM_stsd },
 { ATOM_wave,MP4_ReadBoxContainer, ATOM_mp4a }, /* some quicktime 
mp4a/wave/mp4a.. */
@@ -4974,16 +4999,8 @@ static const struct
 
 { ATOM_mp4s,MP4_ReadBox_sample_mp4s,  ATOM_stsd },
 
-/* XXX there is 2 box where we could find this entry stbl and tref*/
-{ ATOM_hint,MP4_ReadBox_default,  ATOM_tref },
 { ATOM_hint,MP4_ReadBox_default,  ATOM_stbl },
 
-/* found in tref box */
-{ ATOM_dpnd,MP4_ReadBox_default,  ATOM_tref },
-{ ATOM_ipir,MP4_ReadBox_default,  ATOM_tref },
-{ ATOM_mpod,MP4_ReadBox_default,  ATOM_tref },
-{ ATOM_chap,MP4_ReadBox_tref_generic, ATOM_tref },
-
 /* found in hnti */
 { ATOM_rtp, MP4_ReadBox_rtp,  ATOM_hnti },
 { ATOM_sdp, MP4_ReadBox_sdp,  ATOM_hnti },
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 5b8b75fcaa..8603a9ec04 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -156,10 +156,6 @@ typedef int64_t stime_t;
 #define ATOM_hdv2 VLC_FOURCC( 'h', 'd', 'v', '2' )
 #define ATOM_rrtp 

[vlc-commits] contrib: gnutls: use RECONF

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov  | Mon May 20 
22:24:12 2019 +0300| [e77178802019763fd82f755fe8a1bdd88ac08de9] | committer: 
Konstantin Pavlov

contrib: gnutls: use RECONF

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

 contrib/src/gnutls/rules.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 0a3c0b55d9..62e90f1c7a 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -76,6 +76,7 @@ ifdef HAVE_NACL
 endif
 
 .gnutls: gnutls
+   $(RECONF)
cd $< && $(GNUTLS_ENV) ./configure $(GNUTLS_CONF)
cd $< && $(MAKE) -C gl install
cd $< && $(MAKE) -C lib install

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

[vlc-commits] contrib: vorbis: use HAVE_CLANG

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov  | Mon May 20 
22:44:34 2019 +0300| [af5ddf9b03bb4583d5a5fe202663a164a04bdea0] | committer: 
Konstantin Pavlov

contrib: vorbis: use HAVE_CLANG

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

 contrib/src/vorbis/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index 18aa3cbae5..82bf13a8bc 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -24,7 +24,7 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
$(UNPACK)
-ifneq (,$(filter %clang,$(CC)))
+ifdef HAVE_CLANG
$(APPLY) $(SRC)/vorbis/clang.patch
 endif
$(UPDATE_AUTOCONFIG)

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

[vlc-commits] contrib: fxc2 don't raise an error when no win compiler is present and fxc isn't compiled

[Pierre Lamot]

vlc | branch: master | Pierre Lamot  | Tue May 21 19:01:47 
2019 +0200| [38fff08a4450685a46008854a49016e07e56873a] | committer: Konstantin 
Pavlov

contrib: fxc2 don't raise an error when no win compiler is present and fxc 
isn't compiled

Signed-off-by: Konstantin Pavlov 

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

 contrib/src/fxc2/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/fxc2/rules.mak b/contrib/src/fxc2/rules.mak
index e1eff83cdf..93bfbd1062 100644
--- a/contrib/src/fxc2/rules.mak
+++ b/contrib/src/fxc2/rules.mak
@@ -35,7 +35,7 @@ else ifeq ($(shell which i686-w64-mingw32-g++ >/dev/null 2>&1 
|| echo FAIL),)
 FXC2_CXX=i686-w64-mingw32-g++
 FXC2_DLL=dll/d3dcompiler_47_32.dll
 else
-$(error No x86 (cross) compiler found for fxc2)
+FXC2_CXX=$(error No x86 (cross) compiler found for fxc2)
 endif
 
 

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

[vlc-commits] contrib: make HAVE_CLANG a global define

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov  | Wed May 22 
12:44:30 2019 +0300| [279768570763f8c0d8c3dfb3c4cc94f0fba09388] | committer: 
Konstantin Pavlov

contrib: make HAVE_CLANG a global define

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

 contrib/src/main.mak | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index eac95b9112..8944a5a1d7 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -158,9 +158,6 @@ endif
 ifndef HAVE_CROSS_COMPILE
 LN_S = cp -R
 endif
-ifneq ($(findstring clang, $(shell $(CC) --version)),)
-HAVE_CLANG := 1
-endif
 endif
 
 ifdef HAVE_SOLARIS
@@ -178,6 +175,10 @@ EXTRA_CFLAGS += -DWINSTORECOMPAT
 EXTRA_LDFLAGS += -lwinstorecompat
 endif
 
+ifneq ($(findstring clang, $(shell $(CC) --version)),)
+HAVE_CLANG := 1
+endif
+
 cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
 
 EXTRA_CFLAGS += -I$(PREFIX)/include

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

[vlc-commits] contrib: fxc2: remove legacy dependency upon meson cross file

[Pierre Lamot]

vlc | branch: master | Pierre Lamot  | Tue May 21 15:37:51 
2019 +0300| [a5499748dccbbadb2dc97181d488683419bac9d7] | committer: Konstantin 
Pavlov

contrib: fxc2: remove legacy dependency upon meson cross file

Signed-off-by: Konstantin Pavlov 

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

 contrib/src/fxc2/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/fxc2/rules.mak b/contrib/src/fxc2/rules.mak
index 93bfbd1062..2e48d76df2 100644
--- a/contrib/src/fxc2/rules.mak
+++ b/contrib/src/fxc2/rules.mak
@@ -39,7 +39,7 @@ FXC2_CXX=$(error No x86 (cross) compiler found for fxc2)
 endif
 
 
-.fxc2: fxc2 crossfile.meson
+.fxc2: fxc2
cd $< && $(FXC2_CXX) -static fxc2.cpp -o fxc2.exe
cd $< && mkdir -p $(PREFIX)/bin && cp fxc2.exe $(PREFIX)/bin && cp 
$(FXC2_DLL) $(PREFIX)/bin/d3dcompiler_47.dll
touch $@

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

[vlc-commits] l10n: Turkish update

[Kaya Zeren]

vlc/vlc-3.0 | branch: master | Kaya Zeren  | Sun May 19 
15:56:01 2019 +0200| [3e2a8899e1f53106ffb2433be3dfd8936daaf158] | committer: 
Michał Trzebiatowski

l10n: Turkish update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/tr.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/tr.po b/po/tr.po
index aa74b94d4c..06d96d5268 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2019-05-01 17:48+0200\n"
+"PO-Revision-Date: 2019-05-19 15:56+0200\n"
 "Last-Translator: Kaya Zeren , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/yaron/teams/16553/tr/)\n"
 "Language: tr\n"
@@ -4677,11 +4677,11 @@ msgstr "Var olan ses kayıtları (diller) arasında 
dolaşır."
 
 #: src/libvlc-module.c:1391
 msgid "Cycle subtitle track in reverse order"
-msgstr "Alt yazı izlerini ters sırada değiştir"
+msgstr "Alt yazı kayıtlarını ters sırada değiştir"
 
 #: src/libvlc-module.c:1392
 msgid "Cycle through the available subtitle tracks in reverse order."
-msgstr "Kullanılabilecek alt yazı izlerini ters sıra ile değiştirir."
+msgstr "Kullanılabilecek alt yazı kayıtlarını ters sıra ile değiştirir."
 
 #: src/libvlc-module.c:1393
 msgid "Cycle subtitle track"
@@ -6380,7 +6380,7 @@ msgstr "İlk Oynatım"
 #: modules/access/cdda.c:480
 #, c-format
 msgid "Audio CD - Track %02i"
-msgstr "Ses CDsi - Kayıt %02i"
+msgstr "Ses CD - Kayıt %02i"
 
 #: modules/access/cdda.c:720 modules/gui/macosx/VLCOpenWindowController.m:169
 #: modules/gui/qt/ui/open_disk.h:300
@@ -15865,7 +15865,7 @@ msgstr "Yalnız M4A Sesi"
 
 #: modules/demux/mp4/mp4.c:51
 msgid "Ignore non audio tracks from iTunes audio files"
-msgstr "iTunes Ses Dosyalarındaki Ses Olmayan İzler Yok Sayılsın"
+msgstr "iTunes Ses Dosyalarındaki Ses Olmayan Kayıtlar Yok Sayılsın"
 
 #: modules/demux/mp4/mp4.c:56
 msgid "MP4 stream demuxer"

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

[vlc-commits] l10n: Chinese (China) update

[Dian Li]

vlc/vlc-3.0 | branch: master | Dian Li  | Mon May 20 
16:49:59 2019 +0200| [9e922550a7170d64ad910680d4e3c1e4a85ac1d5] | committer: 
Michał Trzebiatowski

l10n: Chinese (China) update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/zh_CN.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 74c153e717..83bb04bd8d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the VLC package.
 #
 # Translators:
-# Dian Li , 2009-2018
+# Dian Li , 2009-2019
 # pingplug , 2016-2017
 # SnowOnion Lee , 2016
 # Sophia Meifang Wang , 2015
@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2018-12-27 16:54+0100\n"
-"Last-Translator: Dian Li , 2018\n"
+"PO-Revision-Date: 2019-05-20 16:49+0200\n"
+"Last-Translator: Dian Li , 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/yaron/teams/16553/;
 "zh_CN/)\n"
 "Language: zh_CN\n"
@@ -20996,7 +20996,7 @@ msgstr "清除"
 
 #: modules/gui/skins2/src/dialogs.cpp:212
 msgid "Open a skin file"
-msgstr "打开一个皮肤文件"
+msgstr "打开皮肤文件"
 
 #: modules/gui/skins2/src/dialogs.cpp:213
 msgid "Skin files |*.vlt;*.wsz;*.xml"

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

[vlc-commits] l10n: Slovak update

[Marián Hikaník]

vlc/vlc-3.0 | branch: master | Marián Hikaník  | Sun 
May 19 19:29:28 2019 +0200| [1ca9043a757b020b3237d4f2af9dbd6d3bfac5ae] | 
committer: Michał Trzebiatowski

l10n: Slovak update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/sk.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/sk.po b/po/sk.po
index 76cc32daef..c4443e74da 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the VLC package.
 #
 # Translators:
-# Marián Hikaník , 2014-2018
+# Marián Hikaník , 2014-2019
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2018-12-20 10:24+0100\n"
-"Last-Translator: Marián Hikaník , 2018\n"
+"PO-Revision-Date: 2019-05-19 19:29+0200\n"
+"Last-Translator: Marián Hikaník , 2019\n"
 "Language-Team: Slovak (https://www.transifex.com/yaron/teams/16553/sk/)\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
@@ -21934,7 +21934,7 @@ msgstr "Otvoriť súbor so vzhľadom"
 
 #: modules/gui/skins2/src/dialogs.cpp:213
 msgid "Skin files |*.vlt;*.wsz;*.xml"
-msgstr "Súbory so vzhľadom programu|*.vlt;*.wsz;*.xml"
+msgstr "Súbory so vzhľadom programu |*.vlt;*.wsz;*.xml"
 
 #: modules/gui/skins2/src/dialogs.cpp:221
 msgid "Playlist Files |"
@@ -21954,7 +21954,7 @@ msgstr "Uložiť playlist"
 
 #: modules/gui/skins2/src/dialogs.cpp:230
 msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html"
-msgstr "XSPF playlist |súbor *.xspf|M3U |playlist *.m3u|HTML|*.html"
+msgstr "playlist XSPF |súbor *.xspf|M3U |playlist *.m3u|HTML |*.html"
 
 #: modules/gui/skins2/src/skin_main.cpp:494
 msgid "Skin to use"

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

[vlc-commits] l10n: Russian update

[Alexander Lakhin]

vlc/vlc-3.0 | branch: master | Alexander Lakhin  | Wed May 
15 19:31:04 2019 +0200| [c08746ef720454d2c53f86b145880055a9d150a9] | committer: 
Michał Trzebiatowski

l10n: Russian update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/ru.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 2107a53d75..c42d385cf0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2019-03-04 04:07+0100\n"
+"PO-Revision-Date: 2019-05-15 19:31+0200\n"
 "Last-Translator: Alexander Lakhin , 2019\n"
 "Language-Team: Russian (https://www.transifex.com/yaron/teams/16553/ru/)\n"
 "Language: ru\n"
@@ -17598,11 +17598,11 @@ msgstr "Перейти ко времени"
 
 #: modules/gui/macosx/VLCMainMenu.m:405
 msgid "Renderer"
-msgstr "Визуализатор"
+msgstr "Воспроизводитель"
 
 #: modules/gui/macosx/VLCMainMenu.m:406
 msgid "No renderer"
-msgstr "Без визуализатора"
+msgstr "Нет воспроизводителя"
 
 #: modules/gui/macosx/VLCMainMenu.m:415
 msgid "Increase Volume"
@@ -21493,7 +21493,7 @@ msgstr "&Очистить"
 
 #: modules/gui/qt/menus.cpp:1629
 msgid ""
-msgstr "&Визуализатор"
+msgstr "&Воспроизводитель"
 
 #: modules/gui/qt/menus.cpp:1633
 msgid ""

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

[vlc-commits] l10n: Chinese (Taiwan) update

[VideoLAN]

vlc/vlc-3.0 | branch: master | VideoLAN  | Tue May 21 
19:18:12 2019 +0200| [bd78e9b0196bba8d27b2a0f38335a40ecbd38a91] | committer: 
Michał Trzebiatowski

l10n: Chinese (Taiwan) update

65% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/zh_TW.po | 11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 29fab90c49..65571343cb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,23 +3,14 @@
 # This file is distributed under the same license as the VLC package.
 #
 # Translators:
-# BISHAN LI , 2015
-# BrLi , 2013
-# byStarTW (pan93412) , 2018
 # Cheng-Chia Tseng , 2017
 # Hsiu-Ming Chang , 2016,2019
 # Ethan Chan , 2015
-# Ethan , 2014
 # Frank Chao , 2013,2015,2017-2018
-# jakech , 2014
 # Jeff Huang , 2014
-# ljkTransifex , 2015
-# TWNateLo , 2017
-# taijuin lee , 2013
+# Taijuin Lee , 2013
 # Timo Liu , 2016
 # Chen Wang , 2013
-# x4r , 2014
-# Zakk , 2017
 # Jeff Huang , 2014
 # 盧瑞元（ryuanlu） , 2012,2017
 # 洪嘉鴻 , 2018

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

[vlc-commits] l10n: Korean update

[VideoLAN]

vlc/vlc-3.0 | branch: master | VideoLAN  | Wed Dec 19 
22:50:15 2018 +0100| [e8ed6b1916248d3be6db56ae728a0372229a27bd] | committer: 
Michał Trzebiatowski

l10n: Korean update

99% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/ko.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/ko.po b/po/ko.po
index 90a1862179..130a884903 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -21465,7 +21465,7 @@ msgstr "재생목록 저장"
 
 #: modules/gui/skins2/src/dialogs.cpp:230
 msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html"
-msgstr "XSPF 재생목록|*.xspf|M3U 파일 |*.m3u|HTML 재생목록 |*.html"
+msgstr "XSPF 재생목록 |*.xspf|M3U 파일 |*.m3u|HTML 재생목록 |*.html"
 
 #: modules/gui/skins2/src/skin_main.cpp:494
 msgid "Skin to use"

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

[vlc-commits] qt: Update languages list

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen  | Wed May 
22 12:29:04 2019 +0200| [e1a7a1085284085ddd97f50aee03e5ae707bffae] | committer: 
Hugo Beauzée-Luyssen

qt: Update languages list

Add new translations & remove missing ones & those below 35% of
completion

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

 modules/gui/qt/components/simple_preferences.cpp | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt/components/simple_preferences.cpp 
b/modules/gui/qt/components/simple_preferences.cpp
index 0c4615a565..f13cb49a96 100644
--- a/modules/gui/qt/components/simple_preferences.cpp
+++ b/modules/gui/qt/components/simple_preferences.cpp
@@ -68,6 +68,11 @@ static struct {
 { "auto",  N_("Auto") },
 { "en","American English" },
 { "ar","عربي" },
+{ "an","Aragonés" },
+{ "as_IN", "অসমীয়া" },
+{ "ast",   "Asturianu" },
+{ "be","беларуская мова" },
+{ "brx",   "बर'/बड़" },
 { "bn","বাংলা" },
 { "pt_BR", "Português Brasileiro" },
 { "en_GB", "British English" },
@@ -86,19 +91,20 @@ static struct {
 { "ga","Gaeilge" },
 { "gd","Gàidhlig" },
 { "gl","Galego" },
-{ "ka","ქართული" },
+{ "gu","ગુજરાતી" },
 { "de","Deutsch" },
 { "he","עברית" },
 { "hr","hrvatski" },
+{ "kn","ಕನ್ನಡ" },
+{ "lv","Latviešu valoda" },
 { "hu","Magyar" },
-{ "hy","հայերեն" },
+{ "mr","मराठी" },
 { "is","íslenska" },
 { "id","Bahasa Indonesia" },
 { "it","Italiano" },
 { "ja","日本語" },
 { "ko","한국어" },
 { "lt","lietuvių" },
-{ "mn","Монгол хэл" },
 { "ms","Melayu" },
 { "nb","Bokmål" },
 { "nn","Nynorsk" },
@@ -106,7 +112,6 @@ static struct {
 { "km","ភាសាខ្មែរ" },
 { "ne","नेपाली" },
 { "oc","Occitan" },
-{ "fa","فارسی" },
 { "pl","Polski" },
 { "pt_PT", "Português" },
 { "pa","ਪੰਜਾਬੀ" },
@@ -117,10 +122,10 @@ static struct {
 { "sr","српски" },
 { "sk","Slovensky" },
 { "sl","slovenščina" },
-{ "ckb",   "کوردیی سۆرانی" },
 { "es","Español" },
+{ "es","Español Mexicano" },
 { "sv","Svenska" },
-{ "te","తెలుగు" },
+{ "th","ภาษาไทย" },
 { "tr","Türkçe" },
 { "uk","украї́нська мо́ва" },
 { "vi","tiếng Việt" },

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

[vlc-commits] l10n: Ukrainian update

[Андрій Бандура]

vlc/vlc-3.0 | branch: master | Андрій Бандура  | 
Sun May 19 17:37:00 2019 +0200| [86f4fbb5f23f3c2b80ddc6496616253fe6df] | 
committer: Michał Trzebiatowski

l10n: Ukrainian update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/uk.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 66df961d60..32daa33c78 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2018-12-20 06:22+0100\n"
-"Last-Translator: Андрій Бандура , 2018\n"
+"PO-Revision-Date: 2019-05-19 17:37+0200\n"
+"Last-Translator: Андрій Бандура , 2019\n"
 "Language-Team: Ukrainian (https://www.transifex.com/yaron/teams/16553/uk/)\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
@@ -21831,7 +21831,8 @@ msgstr "Зберегти список відтворення"
 #: modules/gui/skins2/src/dialogs.cpp:230
 msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html"
 msgstr ""
-"Список відтворення XSPF|*.xspf|M3U file|*.m3u|Список відтворення HTML|*.html"
+"Список відтворення XSPF |*.xspf|файл M3U |*.m3u|Список відтворення HTML |*."
+"html"
 
 #: modules/gui/skins2/src/skin_main.cpp:494
 msgid "Skin to use"

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

[vlc-commits] l10n: Romanian update

[Eduard Pintilie]

vlc/vlc-3.0 | branch: master | Eduard Pintilie  | 
Mon May 20 11:46:44 2019 +0200| [618c5274780d02a30bb3de9358bf965df90c44a6] | 
committer: Michał Trzebiatowski

l10n: Romanian update

72% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/ro.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/po/ro.po b/po/ro.po
index bbc35e67f1..684504102d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -20,7 +20,7 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2019-02-19 14:08+0100\n"
+"PO-Revision-Date: 2019-05-20 11:46+0200\n"
 "Last-Translator: Eduard Pintilie , 2019\n"
 "Language-Team: Romanian (https://www.transifex.com/yaron/teams/16553/ro/)\n"
 "Language: ro\n"
@@ -21500,15 +21500,15 @@ msgstr "Deschide un fișier de tematică"
 
 #: modules/gui/skins2/src/dialogs.cpp:213
 msgid "Skin files |*.vlt;*.wsz;*.xml"
-msgstr "Fișiere tematică|*.vlt;*.wsz;*.xml"
+msgstr "Fișiere tematică |*.vlt;*.wsz;*.xml"
 
 #: modules/gui/skins2/src/dialogs.cpp:221
 msgid "Playlist Files |"
-msgstr ""
+msgstr "Fișiere de listă de redare |"
 
 #: modules/gui/skins2/src/dialogs.cpp:221
 msgid "|All Files |*"
-msgstr ""
+msgstr "|Toate fișierele |*"
 
 #: modules/gui/skins2/src/dialogs.cpp:222
 msgid "Open playlist"
@@ -21521,6 +21521,7 @@ msgstr "Salvează lista de redare"
 #: modules/gui/skins2/src/dialogs.cpp:230
 msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html"
 msgstr ""
+"listă de redare XSPF |*.xspf|fișier M3U |*.m3u|listă de redare HTML |*.html"
 
 #: modules/gui/skins2/src/skin_main.cpp:494
 msgid "Skin to use"

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

[vlc-commits] l10n: Kashmiri (India) update

[VideoLAN]

vlc/vlc-3.0 | branch: master | VideoLAN  | Sun May 19 
18:00:57 2019 +0200| [53070ba664cec82010eae0198ecc43bc879a57de] | committer: 
Michał Trzebiatowski

l10n: Kashmiri (India) update

88% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/ks_IN.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/ks_IN.po b/po/ks_IN.po
index 31614a5e46..62416f1e5c 100644
--- a/po/ks_IN.po
+++ b/po/ks_IN.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2018-12-19 22:50+0100\n"
-"Last-Translator: VideoLAN , 2018\n"
+"PO-Revision-Date: 2019-05-19 18:00+0200\n"
+"Last-Translator: VideoLAN , 2019\n"
 "Language-Team: Kashmiri (India) (https://www.transifex.com/yaron/teams/16553/;
 "ks_IN/)\n"
 "Language: ks_IN\n"
@@ -21503,15 +21503,15 @@ msgstr "اکھ سیکین فایل کْریو اوپْن "
 
 #: modules/gui/skins2/src/dialogs.cpp:213
 msgid "Skin files |*.vlt;*.wsz;*.xml"
-msgstr "سیکین فایلہ|*.vlt;*.wsz;*.xml "
+msgstr "سیکین فایلہ |*.vlt;*.wsz;*.xml "
 
 #: modules/gui/skins2/src/dialogs.cpp:221
 msgid "Playlist Files |"
-msgstr ""
+msgstr "پْلے لِسٹْہ فایلْہ |"
 
 #: modules/gui/skins2/src/dialogs.cpp:221
 msgid "|All Files |*"
-msgstr ""
+msgstr "|تمام فایلْہ |*"
 
 #: modules/gui/skins2/src/dialogs.cpp:222
 msgid "Open playlist"

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

[vlc-commits] l10n: Japanese update

[Fumio Nakayama]

vlc/vlc-3.0 | branch: master | Fumio Nakayama  | Thu Dec 
20 16:17:02 2018 +0100| [fd743680ededaab86edde81014c0da5f33862db1] | committer: 
Michał Trzebiatowski

l10n: Japanese update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/ja.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index cc5aa69a3b..51aa90de88 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2018-12-20 16:17+0100\n"
-"Last-Translator: Fumio Nakayama , 2019\n"
+"PO-Revision-Date: 2018-12-20 16:17+0200\n"
+"Last-Translator: Fumio Nakayama , 2018\n"
 "Language-Team: Japanese (https://www.transifex.com/yaron/teams/16553/ja/)\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -21643,11 +21643,11 @@ msgstr "スキンファイル |*.vlt;*.wsz;*.xml|"
 
 #: modules/gui/skins2/src/dialogs.cpp:221
 msgid "Playlist Files |"
-msgstr "プレイリストファイル|"
+msgstr "プレイリストファイル |"
 
 #: modules/gui/skins2/src/dialogs.cpp:221
 msgid "|All Files |*"
-msgstr "|すべてのファイル|*"
+msgstr "|すべてのファイル |*"
 
 #: modules/gui/skins2/src/dialogs.cpp:222
 msgid "Open playlist"
@@ -21659,7 +21659,7 @@ msgstr "プレイリストを保存"
 
 #: modules/gui/skins2/src/dialogs.cpp:230
 msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html"
-msgstr "XSPFプレイリスト|*.xspf|M3Uファイル|*.m3u|HTMLプレイリスト|*.html"
+msgstr "XSPFプレイリスト |*.xspf|M3Uファイル |*.m3u|HTMLプレイリスト |*.html"
 
 #: modules/gui/skins2/src/skin_main.cpp:494
 msgid "Skin to use"

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

[vlc-commits] l10n: French update

[VideoLAN]

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon May 20 
17:49:40 2019 +0200| [fd136bdce3f7cd65a9b0ab8c61b911386c8df525] | committer: 
Michał Trzebiatowski

l10n: French update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/fr.po | 36 ++--
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 36b1077f08..f1d4f8938b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,11 +4,7 @@
 #
 # Translators:
 # Anaïs V. , 2014
-# BobSynfig, 2015
 # Paul Caranton , 2015
-# Calixte, 2013
-# Alex , 2014
-# Frigory33 , 2017
 # Christophe Lherieau , 2013
 # Emmanuel Simond , 2013
 # Damien Erambert , 2013
@@ -16,33 +12,21 @@
 # Pierre Ynard , 2018-2019
 # Freddydelanuit Dec , 2014
 # Rafaël Carré , 2014
-# chouquette , 2015
-# jipux, 2017
-# Cristallix , 2014
-# Jack Ruertnevel, 2015
-# Louis Boucherie, 2015
-# Loys, 2013
-# sebasthug , 2013
-# lemiaou, 2014
-# Thierry Yves Gaston Stein, 2014
-# Tubuntu , 2013-2014
-# ryann, 2015-2018
+# Hugo Beauzée-Luyssen , 2015
+# ryann, 2015-2019
 # Benoit Andrieu , 2017
-# jb78180 , 2017
 # Mortimer , 2017
-# Romain CONSTANTIN , 2018
-# Aestan , 2018
-# Lionel HANNEQUIN , 2018
-# alpha ratz , 2018
-# tmtisfree , 2018
+# Romain Constantin , 2018
+# Lionel Hannequin , 2018
+# Alpha Ratz , 2018
 # Irriep Nala Novram , 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2019-03-17 09:22+0100\n"
-"Last-Translator: Pierre Ynard , 2019\n"
+"PO-Revision-Date: 2019-05-20 17:49+0200\n"
+"Last-Translator: ryann, 2019\n"
 "Language-Team: French (https://www.transifex.com/yaron/teams/16553/fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -16592,11 +16576,11 @@ msgstr ""
 "multimédia libre et gratuit réalisé par des volontaires de la communauté https://www.videolan.org/\;>VideoLAN.VLC utilise ses "
-"propres codecs et fonctionne sur quasiment toutes les plateformes, il peut "
-"lire quasiment tous les fichiers, CDs, DVDs, flux réseau, cartes de capture "
+"propres codecs, fonctionne sur quasiment toutes les plate-formes, et peut "
+"lire quasiment tous les fichiers, CD, DVD, flux réseau, cartes d'acquisition "
 "et autres formats de médias !https://www.videolan.org/;
 "contribute/\">Aidez nous et rejoignez nous !"
+"\">Aidez-nous et rejoignez-nous !"
 
 #: modules/gui/macosx/VLCAddonsWindowController.m:105
 #: modules/gui/macosx/VLCAddonsWindowController.m:357

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

[vlc-commits] l10n: Portuguese (Portugal) update

[Rui]

vlc/vlc-3.0 | branch: master | Rui  | Wed May 15 14:27:18 
2019 +0200| [1038d3e096a1331cbb47d556c8a3d0599cd0372a] | committer: Michał 
Trzebiatowski

l10n: Portuguese (Portugal) update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/pt_PT.po | 248 +++-
 1 file changed, 129 insertions(+), 119 deletions(-)

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

[vlc-commits] l10n: Dutch update

[Thomas De Rocker]

vlc/vlc-3.0 | branch: master | Thomas De Rocker  | 
Mon May 20 15:52:48 2019 +0200| [85b730b94d220aa9ce97ab12d6ab0c584ee1843a] | 
committer: Michał Trzebiatowski

l10n: Dutch update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/nl.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 33c5a55984..e8c415f1b6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2019-04-30 07:59+0200\n"
+"PO-Revision-Date: 2019-05-20 15:52+0200\n"
 "Last-Translator: Thomas De Rocker , 2019\n"
 "Language-Team: Dutch (https://www.transifex.com/yaron/teams/16553/nl/)\n"
 "Language: nl\n"
@@ -21888,7 +21888,7 @@ msgstr "Afspeellijst opslaan"
 
 #: modules/gui/skins2/src/dialogs.cpp:230
 msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html"
-msgstr "XSPF afspeellijst |*.xspf|M3U-bestand |*.m3u|HTML-afspeellijst|*.html"
+msgstr "XSPF afspeellijst |*.xspf|M3U-bestand |*.m3u|HTML-afspeellijst |*.html"
 
 #: modules/gui/skins2/src/skin_main.cpp:494
 msgid "Skin to use"

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

[vlc-commits] l10n: Latvian update

[Ingmārs Dīriņš]

vlc/vlc-3.0 | branch: master | Ingmārs Dīriņš  | Mon May  
6 12:53:57 2019 +0200| [772c04817efbccbe6f1549590a95d2c05475115a] | committer: 
Michał Trzebiatowski

l10n: Latvian update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/lv.po | 85 
 1 file changed, 43 insertions(+), 42 deletions(-)

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

[vlc-commits] l10n: Marathi update

[VideoLAN]

vlc/vlc-3.0 | branch: master | VideoLAN  | Sun May 19 
18:12:18 2019 +0200| [b29d7f2ef4c668c523a6f03b5c3dfa952594a373] | committer: 
Michał Trzebiatowski

l10n: Marathi update

88% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/mr.po | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/po/mr.po b/po/mr.po
index 477df1805a..1843966bae 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2018-12-19 22:50+0100\n"
-"Last-Translator: VideoLAN , 2018\n"
+"PO-Revision-Date: 2019-05-19 18:12+0200\n"
+"Last-Translator: VideoLAN , 2019\n"
 "Language-Team: Marathi (https://www.transifex.com/yaron/teams/16553/mr/)\n"
 "Language: mr\n"
 "MIME-Version: 1.0\n"
@@ -21364,15 +21364,15 @@ msgstr "आवरण धारिका उघडा"
 
 #: modules/gui/skins2/src/dialogs.cpp:213
 msgid "Skin files |*.vlt;*.wsz;*.xml"
-msgstr "आवरण धारिका|*.व्हीएलटी;*.डब्ल्यूएसझेड;*.एक्सएमएल"
+msgstr "आवरण धारिका |*.व्हीएलटी;*.डब्ल्यूएसझेड;*.एक्सएमएल"
 
 #: modules/gui/skins2/src/dialogs.cpp:221
 msgid "Playlist Files |"
-msgstr ""
+msgstr "चालविण्याची यादी धारिका |"
 
 #: modules/gui/skins2/src/dialogs.cpp:221
 msgid "|All Files |*"
-msgstr ""
+msgstr "|सर्व फाईल्स |*"
 
 #: modules/gui/skins2/src/dialogs.cpp:222
 msgid "Open playlist"
@@ -21385,6 +21385,8 @@ msgstr "चालविण्याचीयादी साठवा"
 #: modules/gui/skins2/src/dialogs.cpp:230
 msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html"
 msgstr ""
+"एक्सएसपीएफ चालविण्याची यादी |*.एक्सएसपीएफ|एम३यू धारिका |*.एम३यू|एचटीएमएल "
+"चालविण्याची यादी |*.एचटीएमएल"
 
 #: modules/gui/skins2/src/skin_main.cpp:494
 msgid "Skin to use"

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

[vlc-commits] l10n: German update

[Michał Trzebiatowski]

vlc/vlc-3.0 | branch: master | Michał Trzebiatowski  | Sun 
May 19 17:06:48 2019 +0200| [dc845a7c2b378a9c4c20c528df1370c5dfcc67ee] | 
committer: Michał Trzebiatowski

l10n: German update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/de.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/de.po b/po/de.po
index 16b32851cb..7c5d6613cd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,7 +23,7 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2019-03-25 15:16+0100\n"
+"PO-Revision-Date: 2019-05-19 17:06+0200\n"
 "Last-Translator: Michał Trzebiatowski , 2019\n"
 "Language-Team: German (https://www.transifex.com/yaron/teams/16553/de/)\n"
 "Language: de\n"
@@ -21482,7 +21482,7 @@ msgstr ""
 
 #: modules/gui/qt/menus.cpp:488
 msgid "Ctrl+L"
-msgstr "Ctrl+L"
+msgstr "Strg+L"
 
 #: modules/gui/qt/menus.cpp:491
 msgid "Docked Playlist"
@@ -21498,7 +21498,7 @@ msgstr " Ansicht"
 
 #: modules/gui/qt/menus.cpp:510
 msgid "Ctrl+H"
-msgstr "Ctrl+H"
+msgstr "Strg+H"
 
 #: modules/gui/qt/menus.cpp:519
 msgid " Interface"
@@ -21650,7 +21650,7 @@ msgstr "ückwärts springen"
 
 #: modules/gui/qt/menus.cpp:926
 msgid "Ctrl+T"
-msgstr "Ctrl+T"
+msgstr "Strg+T"
 
 #: modules/gui/qt/menus.cpp:941
 msgid "Open "
@@ -21982,7 +21982,7 @@ msgstr "Wiedergabeliste speichern"
 #: modules/gui/skins2/src/dialogs.cpp:230
 msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html"
 msgstr ""
-"XSPF Wiedergabeliste |*.xspf|M3U Datei|*.m3u|HTML Wiedergabeliste |*.html"
+"XSPF Wiedergabeliste |*.xspf|M3U Datei |*.m3u|HTML Wiedergabeliste |*.html"
 
 #: modules/gui/skins2/src/skin_main.cpp:494
 msgid "Skin to use"

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

[vlc-commits] l10n: Norwegian Bokmål (Norway) update

[VideoLAN]

vlc/vlc-3.0 | branch: master | VideoLAN  | Tue May 21 
19:17:56 2019 +0200| [3c8abd83fc67225ef1d4c9351c95d06f2ec5ebf4] | committer: 
Michał Trzebiatowski

l10n: Norwegian Bokmål (Norway) update

94% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/nb.po | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/po/nb.po b/po/nb.po
index 71fd1c038c..7ec1b3400f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,9 +6,7 @@
 # Alexander Mackinnon Jansen , 2013-2019
 # Allan Nordhøy , 2014-2017
 # Andreas Dreyer Hysing , 2016
-# asd, 2014
 # bobbaluba , 2013-2014
-# Christian, 2015
 # Erlend Østlie , 2018
 # Harald H. , 2014-2015
 # Imre Kristoffer Eilertsen , 2016-2018
@@ -17,14 +15,11 @@
 # Kurt-Håkon Eilertsen , 2014,2016
 # Mathias Stang , 2015
 # Olav Dahlum , 2011
-# Ridder7 , 2015
 # Sigmund Augdal , 2002
 # Stian Jørgensrud , 2012-2014
-# thomhov, 2014
 # Torstein Husebø , 2017
 # Tronn Dyrstad , 2016
-# tyler moss , 2015-2016
-# Yomawaru, 2016
+# Tyler Moss , 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"

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

[vlc-commits] l10n: Galician update

[antiparvos]

vlc/vlc-3.0 | branch: master | antiparvos  | Mon May 
20 03:01:56 2019 +0200| [3019a477de6a4ad979b6abef84be2578425fb27f] | committer: 
Michał Trzebiatowski

l10n: Galician update

98% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/gl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/gl.po b/po/gl.po
index 069bbba82f..e0dee71358 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2019-01-28 18:52+0100\n"
+"PO-Revision-Date: 2019-05-20 03:01+0200\n"
 "Last-Translator: antiparvos , 2019\n"
 "Language-Team: Galician (https://www.transifex.com/yaron/teams/16553/gl/)\n"
 "Language: gl\n"
@@ -21974,8 +21974,8 @@ msgstr "Gardar a lista de reprodución"
 #: modules/gui/skins2/src/dialogs.cpp:230
 msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html"
 msgstr ""
-"Lista de reprodución XSPF |*.xspf|ficheiro M3U|*.m3u|lista de reprodución "
-"HTML|*.html"
+"Lista de reprodución XSPF |*.xspf|ficheiro M3U |*.m3u|lista de reprodución "
+"HTML |*.html"
 
 #: modules/gui/skins2/src/skin_main.cpp:494
 msgid "Skin to use"

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

[vlc-commits] l10n: Persian update

[VideoLAN]

vlc/vlc-3.0 | branch: master | VideoLAN  | Wed Dec 19 
22:50:15 2018 +0100| [1bb2839cf7a4b791955bb9b0aea49c6f7da6827b] | committer: 
Michał Trzebiatowski

l10n: Persian update

28% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/fa.po | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/po/fa.po b/po/fa.po
index a91262ef9d..47f9fff558 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -4,16 +4,13 @@
 #
 # Translators:
 # Hossein Arshadaghghaleh , 2013
-# saeed farzad , 2013
-# Emad , 2013
+# Saeed Farzad , 2013
 # Goudarz Jafari , 2016-2017
-# imni , 2014
 # Meelad Zakaria , 2007
 # Mohammad Hossein Mojtahedi , 2013
-# mohammad rahmani , 2015-2016
+# Mohammad Rahmani , 2015-2016
 # Na Mira , 2017-2018
 # Pouriya , 2014
-# ropy , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"

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

[vlc-commits] l10n: Italian update

[Vincenzo Reale]

vlc/vlc-3.0 | branch: master | Vincenzo Reale  | Tue May 
21 06:17:59 2019 +0200| [54c5aaf8cdea19885085db696a43a3d7b181d286] | committer: 
Michał Trzebiatowski

l10n: Italian update

99% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/it.po | 25 -
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/po/it.po b/po/it.po
index 89aed24bbc..cd69b7d5f6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,49 +6,40 @@
 # Alessandro Felicetti , 2014
 # Alessandro Forte , 2016
 # Alfonso Maria Marzano , 2014
-# Alixir, 2014
 # Andrea Martini , 2014
 # Antonino Murabito , 2015
 # Ludolf , 2014
 # Claudio Diana , 2016
 # Davide Beatrici , 2014
-# elisa.garufi , 2014
-# franzes melis , 2014
+# Eisa Garufi , 2014
+# Franzes Melis , 2014
 # Francesco Marinucci , 2013
-# ghina90 , 2013
 # Gianmario Salvetti , 2015
-# Guybrush88 , 2014
 # Illuminato Luca Costantino , 2015
 # Jacopo Tumminello , 2015
-# lorenzo facca , 2013-2014
-# Lorenzo Porta, 2013
-# thegladiator , 2014
-# Marco91, 2013
+# Lorenzo Facca , 2013-2014
 # Marco Ciotola <848...@stud.unive.it>, 2015
 # Marco Lazzaro , 2016
 # Mary Piconese , 2014
 # Md Ariful , 2014
 # Mirko Moreschi , 2014
-# Monica , 2014
-# mrk2006 , 2014
-# n.patriarchi , 2014
 # Paolo Ringegni , 2015
 # Paolo Velati , 2013
 # Angelo Prandelli , 2013
 # Roberto91 , 2014
 # Rosario , 2014
-# sara.nocentini , 2014
+# Sara Nocentini , 2014
 # Sebastiano Pistore , 2017-2018
 # Marco Esposito , 2013
 # Veronica Di Giorgio , 2013
-# Vincenzo Reale , 2014-2018
+# Vincenzo Reale , 2014-2019
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2018-12-20 06:38+0100\n"
-"Last-Translator: Vincenzo Reale , 2018\n"
+"PO-Revision-Date: 2019-05-21 06:17+0200\n"
+"Last-Translator: Vincenzo Reale , 2019\n"
 "Language-Team: Italian (https://www.transifex.com/yaron/teams/16553/it/)\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -22016,7 +22007,7 @@ msgstr "Salva scaletta"
 
 #: modules/gui/skins2/src/dialogs.cpp:230
 msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html"
-msgstr "Scaletta XSPF|*.xspf|File M3U|*.m3u|Scaletta HTML|*.html"
+msgstr "Scaletta XSPF |*.xspf|File M3U |*.m3u|Scaletta HTML |*.html"
 
 #: modules/gui/skins2/src/skin_main.cpp:494
 msgid "Skin to use"

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

[vlc-commits] l10n: Icelandic update

[Sveinn í Felli]

vlc/vlc-3.0 | branch: master | Sveinn í Felli  | Wed May 15 
10:11:14 2019 +0200| [aa923ebd2e04e1ccf491f57cf2a01df5357ffc53] | committer: 
Michał Trzebiatowski

l10n: Icelandic update

70% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/is.po | 107 ---
 1 file changed, 55 insertions(+), 52 deletions(-)

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

[vlc-commits] l10n: Spanish update

[picodotdev]

vlc/vlc-3.0 | branch: master | picodotdev  | Tue May 21 
07:33:55 2019 +0200| [bb2954dfe2fbe224fb7a01758f3eae6d6b8f6e77] | committer: 
Michał Trzebiatowski

l10n: Spanish update

100% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/es.po | 13 +++--
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/po/es.po b/po/es.po
index ead4c9317e..2754a93d57 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,24 +4,18 @@
 #
 # Translators:
 # Alvaro Sáez , 2013
-# Chema , 2014
-# alberto , 2013
-# estebande , 2013
-# Chema , 2013
 # Javier Contreras , 2013
 # Juan Diego Fernández Rosado , 2014
 # Konrad Iturbe , 2013
 # Marc Sokolovitch , 2013
 # picodotdev , 2014-2019
 # Sam Askari , 2013
-# saulortega , 2013
-# Yllelder, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2019-04-18 18:06+0200\n"
+"PO-Revision-Date: 2019-05-21 07:33+0200\n"
 "Last-Translator: picodotdev , 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/yaron/teams/16553/es/)\n"
 "Language: es\n"
@@ -21925,8 +21919,7 @@ msgstr "Abrir un archivo de pieles"
 
 #: modules/gui/skins2/src/dialogs.cpp:213
 msgid "Skin files |*.vlt;*.wsz;*.xml"
-msgstr ""
-"Archivos de piel (*.vlt;*.wsz)|*.vlt;wsz|Archivos de piel (*.xml)|*.xml"
+msgstr "Archivos de piel |*.vlt;*.wsz;*.xml"
 
 #: modules/gui/skins2/src/dialogs.cpp:221
 msgid "Playlist Files |"
@@ -21948,7 +21941,7 @@ msgstr "Guardar lista de reproducción"
 msgid "XSPF playlist |*.xspf|M3U file |*.m3u|HTML playlist |*.html"
 msgstr ""
 "Lista de reproducción XSPF |*.xspf|Archivo M3U |*.m3u|Lista de reproducción "
-"HTML |*.htmlu"
+"HTML |*.html"
 
 #: modules/gui/skins2/src/skin_main.cpp:494
 msgid "Skin to use"

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

[vlc-commits] l10n: Estonian update

[Mattias Põldaru]

vlc/vlc-3.0 | branch: master | Mattias Põldaru  | Tue May 21 
05:06:39 2019 +0200| [7c2399503bec7ba62633a80d8d2cc07c96500064] | committer: 
Michał Trzebiatowski

l10n: Estonian update

78% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/et.po | 252 +++
 1 file changed, 124 insertions(+), 128 deletions(-)

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

[vlc-commits] l10n: Spanish (Mexico) update

[VideoLAN]

vlc/vlc-3.0 | branch: master | VideoLAN  | Mon May 20 
08:23:56 2019 +0200| [cfada8ec1a597c57f6e5fcc92f7af0b88ae8d169] | committer: 
Michał Trzebiatowski

l10n: Spanish (Mexico) update

88% translated

Signed-off-by: Michał Trzebiatowski 

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

 po/es_MX.po | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/po/es_MX.po b/po/es_MX.po
index 7ce5cd2c18..0d0f75b51f 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -10,13 +10,11 @@
 # Giovanni Alfredo Garciliano Diaz , 2016
 # Jorge Arturo , 2014
 # Jose lopez , 2013
-# kio-13, 2014
-# Rocio Braud, 2014
 # Luis Jaramillo , 2013
 # Naresu Tenshi , 2014
 # Raquel Gonzalez Orea , 2014
 # Rodrigo Barcelata , 2015
-# walt santos , 2015
+# Walt Santos , 2015
 # William Beltrán , 2015-2016
 # Yusuf (Josè) Luis , 2016
 msgid ""
@@ -24,8 +22,8 @@ msgstr ""
 "Project-Id-Version: vlc 3.0.7\n"
 "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n"
 "POT-Creation-Date: 2018-12-19 17:55+0100\n"
-"PO-Revision-Date: 2018-12-19 22:50+0100\n"
-"Last-Translator: VideoLAN , 2018\n"
+"PO-Revision-Date: 2019-05-20 08:23+0200\n"
+"Last-Translator: VideoLAN , 2019\n"
 "Language-Team: Spanish (Mexico) (https://www.transifex.com/yaron/teams/16553/;
 "es_MX/)\n"
 "Language: es_MX\n"
@@ -21703,7 +21701,6 @@ msgstr "Abrir un archivo de pieles"
 #: modules/gui/skins2/src/dialogs.cpp:213
 msgid "Skin files |*.vlt;*.wsz;*.xml"
 msgstr ""
-"Archivos de piel (*.vlt;*.wsz)|*.vlt;wsz|Archivos de piel (*.xml)|*.xml"
 
 #: modules/gui/skins2/src/dialogs.cpp:221
 msgid "Playlist Files |"

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

[vlc-commits] contrib: fxc2 only check compiler when building for windows

[Pierre Lamot]

vlc | branch: master | Pierre Lamot  | Thu May 16 09:40:40 
2019 +0200| [8d3e4f6905c7efadd2effd4f45011bd38d0d65f9] | committer: Konstantin 
Pavlov

contrib: fxc2 only check compiler when building for windows

Signed-off-by: Konstantin Pavlov 

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

 contrib/src/fxc2/rules.mak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/src/fxc2/rules.mak b/contrib/src/fxc2/rules.mak
index e1eff83cdf..18c0d0128a 100644
--- a/contrib/src/fxc2/rules.mak
+++ b/contrib/src/fxc2/rules.mak
@@ -22,6 +22,7 @@ fxc2: fxc2-$(FXC2_VERSION).tar.xz .sum-fxc2
$(APPLY) 
$(SRC)/fxc2/0004-Revert-Fix-narrowing-conversion-from-int-to-BYTE.patch
$(MOVE)
 
+ifdef HAVE_WIN32
 ifeq ($(ARCH),x86_64)
 FXC2_CXX=$(CXX)
 FXC2_DLL=dll/d3dcompiler_47.dll
@@ -37,7 +38,7 @@ FXC2_DLL=dll/d3dcompiler_47_32.dll
 else
 $(error No x86 (cross) compiler found for fxc2)
 endif
-
+endif
 
 .fxc2: fxc2 crossfile.meson
cd $< && $(FXC2_CXX) -static fxc2.cpp -o fxc2.exe

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

[vlc-commits] contrib: gnutls: use RECONF

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov  | Mon May 20 
22:24:12 2019 +0300| [67791849f16090fc4acc7941ee58a609b42ae2bd] | committer: 
Konstantin Pavlov

contrib: gnutls: use RECONF

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

 contrib/src/gnutls/rules.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 0a3c0b55d9..62e90f1c7a 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -76,6 +76,7 @@ ifdef HAVE_NACL
 endif
 
 .gnutls: gnutls
+   $(RECONF)
cd $< && $(GNUTLS_ENV) ./configure $(GNUTLS_CONF)
cd $< && $(MAKE) -C gl install
cd $< && $(MAKE) -C lib install

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

[vlc-commits] contrib: fxc2: remove legacy dependency upon meson cross file

[Pierre Lamot]

vlc | branch: master | Pierre Lamot  | Tue May 21 15:37:51 
2019 +0300| [e0a284ac5fa632024f8acd8517c0ee7fa1ba543f] | committer: Konstantin 
Pavlov

contrib: fxc2: remove legacy dependency upon meson cross file

Signed-off-by: Konstantin Pavlov 

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

 contrib/src/fxc2/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/fxc2/rules.mak b/contrib/src/fxc2/rules.mak
index c7055b881c..4d7b73b9f3 100644
--- a/contrib/src/fxc2/rules.mak
+++ b/contrib/src/fxc2/rules.mak
@@ -40,7 +40,7 @@ FXC2_CXX=$(error No x86 (cross) compiler found for fxc2)
 endif
 endif
 
-.fxc2: fxc2 crossfile.meson
+.fxc2: fxc2
cd $< && $(FXC2_CXX) -static fxc2.cpp -o fxc2.exe
cd $< && mkdir -p $(PREFIX)/bin && cp fxc2.exe $(PREFIX)/bin && cp 
$(FXC2_DLL) $(PREFIX)/bin/d3dcompiler_47.dll
touch $@

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

[vlc-commits] contrib: vorbis: use HAVE_CLANG

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov  | Mon May 20 
22:44:34 2019 +0300| [43c4cffeb3cdb6043c9bedcafe2971df750a6f85] | committer: 
Konstantin Pavlov

contrib: vorbis: use HAVE_CLANG

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

 contrib/src/vorbis/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index 18aa3cbae5..82bf13a8bc 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -24,7 +24,7 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
 
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
$(UNPACK)
-ifneq (,$(filter %clang,$(CC)))
+ifdef HAVE_CLANG
$(APPLY) $(SRC)/vorbis/clang.patch
 endif
$(UPDATE_AUTOCONFIG)

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

[vlc-commits] contrib: bluray: drop unused configure switches

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov  | Fri Apr 12 
22:45:51 2019 +0300| [a2ce74c34a7da04a63552c94f8d30ec28d834a0a] | committer: 
Konstantin Pavlov

contrib: bluray: drop unused configure switches

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

 contrib/src/bluray/rules.mak | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak
index f510afe2dd..bae6862bb6 100644
--- a/contrib/src/bluray/rules.mak
+++ b/contrib/src/bluray/rules.mak
@@ -29,9 +29,7 @@ endif
 DEPS_bluray = libxml2 $(DEPS_libxml2) freetype2 $(DEPS_freetype2)
 
 BLURAY_CONF = --disable-examples  \
-  --with-libxml2  \
-  --enable-udf\
-  --enable-bdjava
+  --with-libxml2
 
 ifneq ($(WITH_FONTCONFIG), 0)
 DEPS_bluray += fontconfig $(DEPS_fontconfig)

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

[vlc-commits] contrib: fxc2 don't raise an error when no win compiler is present and fxc isn't compiled

[Pierre Lamot]

vlc | branch: master | Pierre Lamot  | Tue May 21 19:01:47 
2019 +0200| [8acab7a1163fb7d335d3a41c3eefd7388d8c62bd] | committer: Konstantin 
Pavlov

contrib: fxc2 don't raise an error when no win compiler is present and fxc 
isn't compiled

Signed-off-by: Konstantin Pavlov 

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

 contrib/src/fxc2/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/fxc2/rules.mak b/contrib/src/fxc2/rules.mak
index 18c0d0128a..c7055b881c 100644
--- a/contrib/src/fxc2/rules.mak
+++ b/contrib/src/fxc2/rules.mak
@@ -36,7 +36,7 @@ else ifeq ($(shell which i686-w64-mingw32-g++ >/dev/null 2>&1 
|| echo FAIL),)
 FXC2_CXX=i686-w64-mingw32-g++
 FXC2_DLL=dll/d3dcompiler_47_32.dll
 else
-$(error No x86 (cross) compiler found for fxc2)
+FXC2_CXX=$(error No x86 (cross) compiler found for fxc2)
 endif
 endif
 

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

[vlc-commits] contrib: make HAVE_CLANG a global define

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov  | Wed May 22 
12:44:30 2019 +0300| [f1329f28288612aac344b6f40edb950e303d55fe] | committer: 
Konstantin Pavlov

contrib: make HAVE_CLANG a global define

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

 contrib/src/main.mak | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index eac95b9112..8944a5a1d7 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -158,9 +158,6 @@ endif
 ifndef HAVE_CROSS_COMPILE
 LN_S = cp -R
 endif
-ifneq ($(findstring clang, $(shell $(CC) --version)),)
-HAVE_CLANG := 1
-endif
 endif
 
 ifdef HAVE_SOLARIS
@@ -178,6 +175,10 @@ EXTRA_CFLAGS += -DWINSTORECOMPAT
 EXTRA_LDFLAGS += -lwinstorecompat
 endif
 
+ifneq ($(findstring clang, $(shell $(CC) --version)),)
+HAVE_CLANG := 1
+endif
+
 cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
 
 EXTRA_CFLAGS += -I$(PREFIX)/include

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

[vlc-commits] contrib: gnutls: Remove one unnecessary level of ifdefs

[Martin Storsjö]

vlc | branch: master | Martin Storsjö  | Wed May 22 13:06:44 
2019 +0300| [38eda60a65b3d91a2da29b7b648163fe09961fd0] | committer: Hugo 
Beauzée-Luyssen

contrib: gnutls: Remove one unnecessary level of ifdefs

The aarch64 assembly in gnutls still needs to be disabled on windows
in general though; the issue is that it unconditionally uses ELF
specific directives (.type, .size, .section), so the disabling isn't
related to any specific issue in clang, but only that gnutls' assembly
for this architecture isn't portable.

Add a comment to clarify the issue.

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

 contrib/src/gnutls/rules.mak | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 8e5101272a..0a3c0b55d9 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -65,12 +65,11 @@ endif
 endif
 ifdef HAVE_WIN32
GNUTLS_CONF += --without-idn
-ifdef HAVE_CLANG
 ifeq ($(ARCH),aarch64)
+   # Gnutls' aarch64 assembly unconditionally uses ELF specific directives
GNUTLS_CONF += --disable-hardware-acceleration
 endif
 endif
-endif
 
 ifdef HAVE_NACL
GNUTLS_CONF += --disable-hardware-acceleration

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

[vlc-commits] contrib: gnutls: Remove one unnecessary level of ifdefs

[Martin Storsjö]

vlc | branch: master | Martin Storsjö  | Wed May 22 13:06:44 
2019 +0300| [649db39e8ac1e7b5d02442f38864ede8d4330f95] | committer: Martin 
Storsjö

contrib: gnutls: Remove one unnecessary level of ifdefs

The aarch64 assembly in gnutls still needs to be disabled on windows
in general though; the issue is that it unconditionally uses ELF
specific directives (.type, .size, .section), so the disabling isn't
related to any specific issue in clang, but only that gnutls' assembly
for this architecture isn't portable.

Add a comment to clarify the issue.

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

 contrib/src/gnutls/rules.mak | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 8e5101272a..0a3c0b55d9 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -65,12 +65,11 @@ endif
 endif
 ifdef HAVE_WIN32
GNUTLS_CONF += --without-idn
-ifdef HAVE_CLANG
 ifeq ($(ARCH),aarch64)
+   # Gnutls' aarch64 assembly unconditionally uses ELF specific directives
GNUTLS_CONF += --disable-hardware-acceleration
 endif
 endif
-endif
 
 ifdef HAVE_NACL
GNUTLS_CONF += --disable-hardware-acceleration

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

[vlc-commits] qt: Sort language list alphabetically

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen  | Wed May 22 
10:16:43 2019 +0200| [0172cadd31de18a01b09fc829104a6e3edf2fb1b] | committer: 
Hugo Beauzée-Luyssen

qt: Sort language list alphabetically

Except for auto & en_US.

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

 modules/gui/qt/components/simple_preferences.cpp | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/gui/qt/components/simple_preferences.cpp 
b/modules/gui/qt/components/simple_preferences.cpp
index 914b92f07d..9d4f809224 100644
--- a/modules/gui/qt/components/simple_preferences.cpp
+++ b/modules/gui/qt/components/simple_preferences.cpp
@@ -68,63 +68,63 @@ static struct {
 { "auto",  N_("Auto") },
 { "en","American English" },
 { "ar","عربي" },
-{ "bn","বাংলা" },
-{ "pt_BR", "Português Brasileiro" },
-{ "en_GB", "British English" },
-{ "el","Νέα Ελληνικά" },
 { "bg","български език" },
+{ "bn","বাংলা" },
 { "ca","Català" },
-{ "zh_TW", "正體中文" },
+{ "ckb",   "کوردیی سۆرانی" },
 { "cs","Čeština" },
 { "cy","Cymraeg" },
 { "da","Dansk" },
-{ "nl","Nederlands" },
-{ "fi","Suomi" },
+{ "de","Deutsch" },
+{ "el","Νέα Ελληνικά" },
+{ "en_GB", "British English" },
+{ "es","Español" },
 { "et","eesti keel" },
 { "eu","Euskara" },
+{ "fa","فارسی" },
+{ "fi","Suomi" },
 { "fr","Français" },
 { "ga","Gaeilge" },
 { "gd","Gàidhlig" },
 { "gl","Galego" },
-{ "ka","ქართული" },
-{ "de","Deutsch" },
 { "he","עברית" },
 { "hr","hrvatski" },
 { "hu","Magyar" },
 { "hy","հայերեն" },
-{ "is","íslenska" },
 { "id","Bahasa Indonesia" },
+{ "is","íslenska" },
 { "it","Italiano" },
 { "ja","日本語" },
+{ "ka","ქართული" },
+{ "kk","Қазақ тілі" },
+{ "km","ភាសាខ្មែរ" },
 { "ko","한국어" },
 { "lt","lietuvių" },
 { "mn","Монгол хэл" },
 { "ms","Melayu" },
 { "nb","Bokmål" },
-{ "nn","Nynorsk" },
-{ "kk","Қазақ тілі" },
-{ "km","ភាសាខ្មែរ" },
 { "ne","नेपाली" },
+{ "nl","Nederlands" },
+{ "nn","Nynorsk" },
 { "oc","Occitan" },
-{ "fa","فارسی" },
+{ "pa","ਪੰਜਾਬੀ" },
 { "pl","Polski" },
+{ "pt_BR", "Português Brasileiro" },
 { "pt_PT", "Português" },
-{ "pa","ਪੰਜਾਬੀ" },
 { "ro","Română" },
 { "ru","Русский" },
-{ "zh_CN", "简体中文" },
 { "si","සිංහල" },
-{ "sr","српски" },
 { "sk","Slovensky" },
 { "sl","slovenščina" },
-{ "ckb",   "کوردیی سۆرانی" },
-{ "es","Español" },
+{ "sr","српски" },
 { "sv","Svenska" },
 { "te","తెలుగు" },
 { "tr","Türkçe" },
 { "uk","украї́нська мо́ва" },
 { "vi","tiếng Việt" },
-{ "wa","Walon" }
+{ "wa","Walon" },
+{ "zh_CN", "简体中文" },
+{ "zh_TW", "正體中文" },
 };
 
 static int getDefaultAudioVolume(const char *aout)

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

[vlc-commits] win32: build.sh: add an option to build with PDB

[Steve Lhomme]

vlc | branch: master | Steve Lhomme  | Tue May 21 11:25:00 
2019 +0200| [377b00bf1ed90478ebff1753aa665d0f5feb8cf0] | committer: Steve Lhomme

win32: build.sh: add an option to build with PDB

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

 extras/package/win32/build.sh | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index 6dd73999ea..5c1c780990 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -27,11 +27,12 @@ OPTIONS:
-i   Create an Installer (n: nightly, r: release, u: unsigned 
release archive, m: msi only)
-sInteractive shell (get correct environment variables for 
build)
-b   Enable breakpad support and send crash reports to this URL
+   -dCreate PDB files during the build
 EOF
 }
 
 ARCH="x86_64"
-while getopts "hra:pcli:sb:" OPTION
+while getopts "hra:pcli:sb:d" OPTION
 do
  case $OPTION in
  h)
@@ -63,6 +64,9 @@ do
  b)
  BREAKPAD=$OPTARG
  ;;
+ d)
+ WITH_PDB="yes"
+ ;;
  esac
 done
 shift $(($OPTIND - 1))
@@ -118,6 +122,9 @@ info "Building contribs"
 echo $PATH
 
 mkdir -p contrib/contrib-$SHORTARCH && cd contrib/contrib-$SHORTARCH
+if [ ! -z "$WITH_PDB" ]; then
+CONTRIBFLAGS="$CONTRIBFLAGS --enable-pdb"
+fi
 if [ ! -z "$BREAKPAD" ]; then
  CONTRIBFLAGS="$CONTRIBFLAGS --enable-breakpad"
 fi
@@ -157,6 +164,9 @@ fi
 if [ ! -z "$BREAKPAD" ]; then
  CONFIGFLAGS="$CONFIGFLAGS --with-breakpad=$BREAKPAD"
 fi
+if [ ! -z "$WITH_PDB" ]; then
+CONFIGFLAGS="$CONFIGFLAGS --enable-pdb"
+fi
 
 ../extras/package/win32/configure.sh --host=$TRIPLET $CONFIGFLAGS
 

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

[vlc-commits] tools: fix patching ltmain.sh

[Steve Lhomme]

vlc | branch: master | Steve Lhomme  | Fri May 17 10:10:24 
2019 +0200| [c3b6aa2ac2f3b79758080fde13b247adefc9d04e] | committer: Steve Lhomme

tools: fix patching ltmain.sh

In the distributed tar.gz ltmain.sh is read only so we can't patch it on UNIX
systems.

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

 extras/tools/tools.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index f20934284d..cc55732cb4 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -125,6 +125,7 @@ libtool-$(LIBTOOL_VERSION).tar.gz:
 
 libtool: libtool-$(LIBTOOL_VERSION).tar.gz
$(UNPACK)
+   (cd $(UNPACK_DIR) && chmod u+w build-aux/ltmain.sh)
$(APPLY) libtool-2.4.6-bitcode.patch
$(APPLY) libtool-2.4.6-san.patch
$(APPLY) libtool-2.4.6-clang-libs.patch

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

[vlc-commits] tools: autoreconf libtool

[Steve Lhomme]

vlc | branch: master | Steve Lhomme  | Fri May 17 10:23:08 
2019 +0200| [b867909e3f17a4365b0b2659dc5c4cb068040422] | committer: Steve Lhomme

tools: autoreconf libtool

Not all systems have aclocal-1.15.

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

 extras/tools/tools.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index cc55732cb4..bd3c27b717 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -130,6 +130,7 @@ libtool: libtool-$(LIBTOOL_VERSION).tar.gz
$(APPLY) libtool-2.4.6-san.patch
$(APPLY) libtool-2.4.6-clang-libs.patch
$(APPLY) libtool-2.4.6-response-files.patch
+   (cd $(UNPACK_DIR) && autoreconf)
$(MOVE)
 
 .buildlibtool: libtool .automake .help2man

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