[vlc-commits] mkv: remove incorrect use of N_()
vlc | branch: master | Rémi Denis-Courmont | Sat May 16
23:27:02 2015 +0300| [3d94da0dbd0c468c493ae8d9c8f0b993d65da3b0] | committer:
Rémi Denis-Courmont
mkv: remove incorrect use of N_()
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3d94da0dbd0c468c493ae8d9c8f0b993d65da3b0
---
modules/demux/mkv/chapter_command.cpp | 10 +-
modules/demux/mkv/demux.cpp |2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/demux/mkv/chapter_command.cpp
b/modules/demux/mkv/chapter_command.cpp
index a6821d6..30eee29 100644
--- a/modules/demux/mkv/chapter_command.cpp
+++ b/modules/demux/mkv/chapter_command.cpp
@@ -133,28 +133,28 @@ std::string dvd_chapter_codec_c::GetCodecName( bool
f_for_title ) const
uint16_t i_title = (p_data[1] << 8) + p_data[2];
char psz_str[11];
sprintf( psz_str, " %d ---", i_title );
-result = N_("--- DVD Title");
+result = "--- DVD Title";
result += psz_str;
}
else */ if ( p_data[0] == MATROSKA_DVD_LEVEL_LU )
{
char psz_str[11];
sprintf( psz_str, " (%c%c) ---", p_data[1], p_data[2] );
-result = N_("--- DVD Menu");
+result = "--- DVD Menu";
result += psz_str;
}
else if ( p_data[0] == MATROSKA_DVD_LEVEL_SS && f_for_title )
{
if ( p_data[1] == 0x00 )
-result = N_("First Played");
+result = "First Played";
else if ( p_data[1] == 0xC0 )
-result = N_("Video Manager");
+result = "Video Manager";
else if ( p_data[1] == 0x80 )
{
uint16_t i_title = (p_data[2] << 8) + p_data[3];
char psz_str[20];
sprintf( psz_str, " %d -", i_title );
-result = N_("- Title");
+result = "- Title";
result += psz_str;
}
}
diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index c49c5cb..9ed3729 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -705,7 +705,7 @@ bool demux_sys_t::PreloadLinked()
}
if( !p_title->psz_name &&
-asprintf(&(p_title->psz_name), "%s %d",
N_("Segment"), (int)ij) == -1 )
+asprintf(&(p_title->psz_name), "%s %d", "Segment",
(int)ij) == -1 )
p_title->psz_name = NULL;
}
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] fix POTFILES.in
vlc | branch: master | David Fuhrmann | Sat May 16 22:08:43 2015 +0200| [dce178aa68d6d7fe39407659e878a00f48bf1ba2] | committer: David Fuhrmann fix POTFILES.in > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dce178aa68d6d7fe39407659e878a00f48bf1ba2 --- po/POTFILES.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 773a728..acb4945 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -536,8 +536,8 @@ modules/demux/xiph_metadata.h modules/demux/xiph_metadata.c modules/gui/macosx/about.h modules/gui/macosx/about.m -modules/gui/macosx/AddonManager.h -modules/gui/macosx/AddonManager.m +modules/gui/macosx/AddonsWindowController.h +modules/gui/macosx/AddonsWindowController.m modules/gui/macosx/AppleRemote.h modules/gui/macosx/AppleRemote.m modules/gui/macosx/applescript.h ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Transform AddonsManager to NSWindowController subclass
vlc | branch: master | David Fuhrmann | Sat May 16
21:33:38 2015 +0200| [d7657086b6950c386f4835ab3c0f3ab6e6a502c5] | committer:
David Fuhrmann
macosx: Transform AddonsManager to NSWindowController subclass
Removes singleton, fixes initialization and deletion. Renames to
AddonsWindowController.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d7657086b6950c386f4835ab3c0f3ab6e6a502c5
---
.../Resources/English.lproj/AddonManager.xib | 214 ++--
.../package/macosx/vlc.xcodeproj/project.pbxproj | 16 +-
.../{AddonManager.h => AddonsWindowController.h} |5 +-
.../{AddonManager.m => AddonsWindowController.m} | 43 ++--
modules/gui/macosx/MainMenu.h |4 +-
modules/gui/macosx/MainMenu.m | 13 +-
modules/gui/macosx/Modules.am |4 +-
7 files changed, 146 insertions(+), 153 deletions(-)
Diff:
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=d7657086b6950c386f4835ab3c0f3ab6e6a502c5
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Use NSWindowController for error panel, lazy initialization
vlc | branch: master | David Fuhrmann | Sat May 16 21:55:13 2015 +0200| [0aad5ff31efeee398742f957c185c8532dbb412a] | committer: David Fuhrmann macosx: Use NSWindowController for error panel, lazy initialization > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0aad5ff31efeee398742f957c185c8532dbb412a --- .../macosx/Resources/English.lproj/ErrorPanel.xib | 45 +-- modules/gui/macosx/MainMenu.m |2 +- modules/gui/macosx/coredialogs.h | 46 ++-- modules/gui/macosx/coredialogs.m | 35 +++ 4 files changed, 72 insertions(+), 56 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/ErrorPanel.xib b/extras/package/macosx/Resources/English.lproj/ErrorPanel.xib index 5c41dbc..bb1d7b8 100644 --- a/extras/package/macosx/Resources/English.lproj/ErrorPanel.xib +++ b/extras/package/macosx/Resources/English.lproj/ErrorPanel.xib @@ -32,7 +32,7 @@ - VLCErrorPanel + ErrorWindowController FirstResponder @@ -304,14 +304,6 @@ 13 - - o_window - - - - 14 - - cleanupTable: @@ -321,6 +313,14 @@ + window + + + + 75 + + + dataSource @@ -474,13 +474,13 @@ - 74 + 75 - VLCErrorPanel - NSObject + ErrorWindowController + NSWindowController cleanupTable: id @@ -517,7 +517,7 @@ - VLCErrorPanel + ErrorWindowController cleanupTable: id @@ -680,6 +680,25 @@ AppKit.framework/Headers/NSWindow.h + + NSWindowController + NSResponder + + showWindow: + id + + + showWindow: + + showWindow: + id + + + + IBFrameworkSource + AppKit.framework/Headers/NSWindowController.h + + 0 diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m index eb7bf0c..3660bc0 100644 --- a/modules/gui/macosx/MainMenu.m +++ b/modules/gui/macosx/MainMenu.m @@ -1262,7 +1262,7 @@ static VLCMainMenu *_o_sharedInstance = nil; - (IBAction)vie
[vlc-commits] Fix AUTHORS
vlc/vlc-2.2 | branch: master | Christoph Miebach | Sat May 16 10:13:20 2015 -0400| [ce4f00795d9906e8ba1b2c8bdbf460bf29b30d0b] | committer: Christoph Miebach Fix AUTHORS > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=ce4f00795d9906e8ba1b2c8bdbf460bf29b30d0b --- AUTHORS |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index c3d7474..0c4c96b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -696,6 +696,7 @@ Localization Abdul Fousan - Tamil A. Decorte - Friulian +A. Regnander - Swedish Adem Gunes - Turkish Adi Nugroho - Tagalog Adnan Memija - Bosnian @@ -729,6 +730,7 @@ Bayarsaikhan Enkhtaivan Баярсайхан Энхтайван - Mongolian Biraj Karmakar - Bengali (India) Bruno Queirós - Portuguese Bruno Vella - Italian +Caner Başaran - Turkish Carlo Calabrò - Italian Chandan Kumar - Hindi Chesús Daniel Trigo - Aragonese @@ -846,6 +848,7 @@ Omer Ensari - Kurmanji (Kurdish) Osama Khalid - Arabic Otto Kekäläinen - Finnish Paras Nath Chaudhary - Nepali +Pasindu Kavinda - Sinhala Pau Iranzo - Catalan Paula Iglesias - Galician Pedro Valadares - Portuguese @@ -871,6 +874,7 @@ Sam Askari - Spanish Sam Hocevar - British Samuel Hocevar - French Saúl Ortega - Spanish +Savvas Nesseris - Modern Greek Sayan Chowdhury - Hindi Seanán Ó Coistín - Irish Semsudin Abdic - Bosnian @@ -880,7 +884,7 @@ Shashi Ranjan - Hindi Siarhei Daryichau Дар'ічаў Сяргей - Belarusian Sidney Doria - Brazilian Portuguese Sigmund Augdal - Norwegian Bokmål -Simos Xenitellis - Greek +Simos Xenitellis - Modern Greek Sipho Sibiya - Zulu Sok Sophea - Khmer Solomon Gizaw - Amharic ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Adding translator
vlc | branch: master | Christoph Miebach | Sat May 16 09:50:44 2015 -0400| [45a7d348aa0c9eb42f91843a4447749a1f943768] | committer: Christoph Miebach Adding translator > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=45a7d348aa0c9eb42f91843a4447749a1f943768 --- AUTHORS |1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 0ee2025..a6ae55d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -801,6 +801,7 @@ Sam Askari - Spanish Sam Hocevar - British Samuel Hocevar - French Saúl Ortega - Spanish +Savvas Nesseris - Modern Greek Sayan Chowdhury - Hindi Seanán Ó Coistín - Irish Semsudin Abdic - Bosnian ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Adding translator
vlc | branch: master | Christoph Miebach | Sat May 16 09:47:27 2015 -0400| [f136e9b12f4d3e8271e20484c62db71f93f7e4e4] | committer: Christoph Miebach Adding translator > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f136e9b12f4d3e8271e20484c62db71f93f7e4e4 --- AUTHORS |1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 9ef45ef..e6dfd09 100644 --- a/AUTHORS +++ b/AUTHORS @@ -625,6 +625,7 @@ Localization Abdul Fousan - Tamil A. Decorte - Friulian +A. Regnander - Swedish Adem Gunes - Turkish Adi Nugroho - Tagalog Adnan Memija - Bosnian ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Adding translator
vlc | branch: master | Christoph Miebach | Sat May 16 09:50:25 2015 -0400| [2430a3c3ab4c7535c7a6f6c1cfd4dc2e7c4f29bd] | committer: Christoph Miebach Adding translator > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2430a3c3ab4c7535c7a6f6c1cfd4dc2e7c4f29bd --- AUTHORS |1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index a8f41f3..0ee2025 100644 --- a/AUTHORS +++ b/AUTHORS @@ -775,6 +775,7 @@ Omer Ensari - Kurmanji (Kurdish) Osama Khalid - Arabic Otto Kekäläinen - Finnish Paras Nath Chaudhary - Nepali +Pasindu Kavinda - Sinhala Pau Iranzo - Catalan Paula Iglesias - Galician Pedro Valadares - Portuguese ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Adding translator
vlc | branch: master | Christoph Miebach | Sat May 16 10:05:19 2015 -0400| [39d906ef7b27b32bae59063b9384442e11972066] | committer: Christoph Miebach Adding translator > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=39d906ef7b27b32bae59063b9384442e11972066 --- AUTHORS |1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 19fe2ee..ef1697e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -708,6 +708,7 @@ Hemanta Nandi - Bengali (India) Huw Waters - Welsh H.Shalitha Vikum - Sinhala Ibrahima Sarr - Fulah +Ingmārs Dīriņš - Latvian Israt Jahan - Bengali Ivar Smolin - Estonian Iván Seoane Pardo - Galician ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Fixing AUTHORS
vlc | branch: master | Christoph Miebach | Sat May 16 09:51:17 2015 -0400| [36ddcf158120d2f086843f0d10b4c34f31ad2e10] | committer: Christoph Miebach Fixing AUTHORS > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=36ddcf158120d2f086843f0d10b4c34f31ad2e10 --- AUTHORS |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index a6ae55d..ea7cfdc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -811,7 +811,7 @@ Shashi Ranjan - Hindi Siarhei Daryichau Дар'ічаў Сяргей - Belarusian Sidney Doria - Brazilian Portuguese Sigmund Augdal - Norwegian Bokmål -Simos Xenitellis - Greek +Simos Xenitellis - Modern Greek Sipho Sibiya - Zulu Sok Sophea - Khmer Solomon Gizaw - Amharic ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Adding translator
vlc | branch: master | Christoph Miebach | Sat May 16 10:05:03 2015 -0400| [82a0b0b4e762eb005699c8b678592320e9d237b6] | committer: Christoph Miebach Adding translator > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=82a0b0b4e762eb005699c8b678592320e9d237b6 --- AUTHORS |1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index ea7cfdc..19fe2ee 100644 --- a/AUTHORS +++ b/AUTHORS @@ -646,6 +646,7 @@ Andrey Wolk - Russian Andri Pálsson - Icelandic Andriy Bandura - Ukrainian Anh Phan - Vietnamese +Aniket Eknath Kudale - Marathi Animesh Swar - Nepalese Aputsiaĸ Niels Janussen - Danish Ara Bextiyar - Sorani (Kurdish) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Adding translator
vlc | branch: master | Christoph Miebach | Sat May 16 09:50:10 2015 -0400| [b2d1253aad9a5efdd417668e6d777937fc4ae51a] | committer: Christoph Miebach Adding translator > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b2d1253aad9a5efdd417668e6d777937fc4ae51a --- AUTHORS |1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index e6dfd09..a8f41f3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -658,6 +658,7 @@ Bayarsaikhan Enkhtaivan Баярсайхан Энхтайван - Mongolian Biraj Karmakar - Bengali (India) Bruno Queirós - Portuguese Bruno Vella - Italian +Caner Başaran - Turkish Carlo Calabrò - Italian Chandan Kumar - Hindi Chesús Daniel Trigo - Aragonese ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] codec: avcodec: assert provides no safety
vlc | branch: master | Francois Cartegnie | Sat May 16 15:24:55 2015 +0200| [c5d61dbf0f53fcc753f47eae7ccfe53767571b35] | committer: Francois Cartegnie codec: avcodec: assert provides no safety refs #14649 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c5d61dbf0f53fcc753f47eae7ccfe53767571b35 --- modules/codec/avcodec/audio.c |3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c index da521e5..fd3a7c0 100644 --- a/modules/codec/avcodec/audio.c +++ b/modules/codec/avcodec/audio.c @@ -313,6 +313,9 @@ static block_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block ) } assert( p_block->i_buffer >= (unsigned)used ); +if( used > p_block->i_buffer ) +used = p_block->i_buffer; + p_block->p_buffer += used; p_block->i_buffer -= used; } ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Remove sharedInstance from About window and rework
vlc | branch: master | David Fuhrmann | Sat May 16 12:24:31 2015 +0200| [491bef0b30ff9771eb0298033a4cede5e1994f31] | committer: David Fuhrmann macosx: Remove sharedInstance from About window and rework Removes sharedInstance from About window controller, and rework as a NSWindowController subclass. This is the new owner of the xib and thus instantiated outside the nib bundle. Splits Help window in own xib and add own NSWindowController as well. refs #5556 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=491bef0b30ff9771eb0298033a4cede5e1994f31 --- Makefile.am|1 + .../macosx/Resources/English.lproj/About.xib | 630 .../macosx/Resources/English.lproj/Help.xib| 408 + .../package/macosx/vlc.xcodeproj/project.pbxproj | 13 + modules/gui/macosx/MainMenu.h |8 +- modules/gui/macosx/MainMenu.m | 17 +- modules/gui/macosx/about.h | 21 +- modules/gui/macosx/about.m | 254 8 files changed, 694 insertions(+), 658 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=491bef0b30ff9771eb0298033a4cede5e1994f31 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] fix archive module compilation
vlc | branch: master | Steve Lhomme | Fri May 15 15:30:07 2015 +0200| [55c15c23a04b4456807fea5cf32f75420e469353] | committer: Rémi Denis-Courmont fix archive module compilation Signed-off-by: Rémi Denis-Courmont > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=55c15c23a04b4456807fea5cf32f75420e469353 --- modules/access/Makefile.am |1 + 1 file changed, 1 insertion(+) diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am index b3fad9f..5ded5f5 100644 --- a/modules/access/Makefile.am +++ b/modules/access/Makefile.am @@ -68,6 +68,7 @@ endif libaccess_archive_plugin_la_SOURCES = access/archive/access.c access/archive/stream.c \ access/archive/archive.h access/archive/archive.c +libaccess_archive_plugin_la_CFLAGS = $(AM_CFLAGS) $(ARCHIVE_CFLAGS) libaccess_archive_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' libaccess_archive_plugin_la_LIBADD = $(ARCHIVE_LIBS) access_LTLIBRARIES += $(LTLIBaccess_archive) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] add stdcxx_11 to the list of M4 files
vlc | branch: master | Steve Lhomme | Fri May 15 13:11:46 2015 +0200| [93c858553d3b952e4358077d215bc04d9d6e54f6] | committer: Rémi Denis-Courmont add stdcxx_11 to the list of M4 files Signed-off-by: Rémi Denis-Courmont > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=93c858553d3b952e4358077d215bc04d9d6e54f6 --- m4/Makefile.am |1 + 1 file changed, 1 insertion(+) diff --git a/m4/Makefile.am b/m4/Makefile.am index 811223f..45499ea 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -27,6 +27,7 @@ EXTRA_DIST = \ private.m4 \ progtest.m4 \ size_max.m4 \ + stdcxx_11.m4 \ stdint_h.m4 \ uintmax_t.m4 \ visibility.m4 \ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: fix incorrectly referenced HTTPConnection.hpp
vlc | branch: master | Steve Lhomme | Fri May 15 14:02:54 2015 +0200| [848658f2d8d1fef965e465b9d3888abb015d4eab] | committer: Rémi Denis-Courmont demux: fix incorrectly referenced HTTPConnection.hpp Signed-off-by: Rémi Denis-Courmont > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=848658f2d8d1fef965e465b9d3888abb015d4eab --- modules/demux/Makefile.am |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am index 5bddd34..cb34603 100644 --- a/modules/demux/Makefile.am +++ b/modules/demux/Makefile.am @@ -327,7 +327,7 @@ libdash_plugin_la_SOURCES += \ demux/adaptative/http/Chunk.cpp \ demux/adaptative/http/Chunk.h \ demux/adaptative/http/HTTPConnection.cpp \ -demux/adaptative/http/HTTPConnection.h \ +demux/adaptative/http/HTTPConnection.hpp \ demux/adaptative/http/HTTPConnectionManager.cpp \ demux/adaptative/http/HTTPConnectionManager.h \ demux/adaptative/http/Sockets.hpp \ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] playlist: automatically resume from pause when uncorked
vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont | Mon Dec
15 19:24:25 2014 +0200| [5e840db932a0022e662b5042327dacf303304c79] | committer:
Rémi Denis-Courmont
playlist: automatically resume from pause when uncorked
(derived from commit ab500430e6dfd02ae4e19ecb9a3d76f3f9486522)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=5e840db932a0022e662b5042327dacf303304c79
---
src/playlist/engine.c | 26 ++
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index ebb46dc..af2637c 100644
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -83,18 +83,20 @@ static int CorksCallback( vlc_object_t *obj, char const
*var,
if( !old.i_int == !cur.i_int )
return VLC_SUCCESS; /* nothing to do */
-if( cur.i_int )
-{
-if( var_InheritBool( obj, "playlist-cork" ) )
-{
-msg_Dbg( obj, "corked" );
-playlist_Pause( pl );
-}
-else
-msg_Dbg( obj, "not corked" );
-}
-else
-msg_Dbg( obj, "uncorked" );
+if( !var_InheritBool( obj, "playlist-cork" ) )
+return VLC_SUCCESS;
+
+input_thread_t *input = playlist_CurrentInput(pl);
+if( input == NULL )
+return VLC_SUCCESS;
+
+bool playing = var_GetInteger(input, "state") == PLAYING_S;
+vlc_object_release(input);
+if( playing == !cur.i_int )
+return VLC_SUCCESS;
+
+msg_Dbg( obj, "%scorked", cur.i_int ? "" : "un" );
+playlist_Pause( pl );
(void) var; (void) dummy;
return VLC_SUCCESS;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
