[vlc-commits] macosx: Use outlets for MainMenu validateMenuItem

2016-06-26 Thread Marvin Scholz 
vlc | branch: master | Marvin Scholz  | Fri Jun 17 21:42:09 
2016 +0200| [27e8d938ad7cf81335f3aba25241f6a94be5c1a6] | committer: 
Jean-Baptiste Kempf

macosx: Use outlets for MainMenu validateMenuItem

This replaces the string comparisons with outlet
pointer comparisons, should speed up things a bit.

Additionally it refactors the the Teletext loop
to use a Objective C iteration.

Signed-off-by: Jean-Baptiste Kempf 

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

 modules/gui/macosx/MainMenu.m |   87 ++---
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 030aa48..02aa3b1 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -1539,101 +1539,108 @@
 - (BOOL)validateMenuItem:(NSMenuItem *)mi
 {
 NSString *title = [mi title];
-BOOL bEnabled = TRUE;
+BOOL enabled = YES;
 vlc_value_t val;
 playlist_t *p_playlist = pl_Get(getIntf());
 input_thread_t *p_input = playlist_CurrentInput(p_playlist);
 
-if ([title isEqualToString: _NS("Stop")]) {
+if (mi == _stop || mi == _voutMenustop || mi == _dockMenustop) {
 if (!p_input)
-bEnabled = FALSE;
+enabled = NO;
 [self setupMenus]; /* Make sure input menu is up to date */
-} else if ([title isEqualToString: _NS("Record")]) {
-bEnabled = FALSE;
-if (p_input)
-bEnabled = var_GetBool(p_input, "can-record");
-} else if ([title isEqualToString: _NS("Previous")] ||
-[title isEqualToString: _NS("Next")]) {
+} else if (mi == _previous  ||
+   mi == _voutMenuprev  ||
+   mi == _dockMenuprevious  ||
+   mi == _next  ||
+   mi == _voutMenunext  ||
+   mi == _dockMenunext
+   ) {
 PL_LOCK;
-bEnabled = playlist_CurrentSize(p_playlist) > 1;
+enabled = playlist_CurrentSize(p_playlist) > 1;
 PL_UNLOCK;
-} else if ([title isEqualToString: _NS("Random")]) {
+} else if (mi == _record) {
+enabled = NO;
+if (p_input)
+enabled = var_GetBool(p_input, "can-record");
+} else if (mi == _random) {
 int i_state;
 var_Get(p_playlist, "random", );
 i_state = val.b_bool ? NSOnState : NSOffState;
 [mi setState: i_state];
-} else if ([title isEqualToString: _NS("Repeat One")]) {
+} else if (mi == _repeat) {
 int i_state;
 var_Get(p_playlist, "repeat", );
 i_state = val.b_bool ? NSOnState : NSOffState;
 [mi setState: i_state];
-} else if ([title isEqualToString: _NS("Repeat All")]) {
+} else if (mi == _loop) {
 int i_state;
 var_Get(p_playlist, "loop", );
 i_state = val.b_bool ? NSOnState : NSOffState;
 [mi setState: i_state];
-} else if ([title isEqualToString: _NS("Quit after Playback")]) {
+} else if (mi == _quitAfterPB) {
 int i_state;
 bool b_value = var_InheritBool(p_playlist, "play-and-exit");
 i_state = b_value ? NSOnState : NSOffState;
 [mi setState: i_state];
-} else if ([title isEqualToString: _NS("Step Forward")] ||
-   [title isEqualToString: _NS("Step Backward")] ||
-   [title isEqualToString: _NS("Jump to Time")]) {
+} else if (mi == _fwd || mi == _bwd || mi == _jumpToTime) {
 if (p_input != NULL) {
 var_Get(p_input, "can-seek", );
-bEnabled = val.b_bool;
+enabled = val.b_bool;
+} else {
+enabled = NO;
 }
-else bEnabled = FALSE;
-} else if ([title isEqualToString: _NS("Mute")]) {
+} else if (mi == _mute || mi == _dockMenumute || mi == _voutMenumute) {
 [mi setState: [[VLCCoreInteraction sharedInstance] mute] ? NSOnState : 
NSOffState];
 [self setupMenus]; /* Make sure audio menu is up to date */
 [self refreshAudioDeviceList];
-} else if ([title isEqualToString: _NS("Half Size")] ||
-   [title isEqualToString: _NS("Normal Size")] ||
-   [title isEqualToString: _NS("Double Size")] ||
-   [title isEqualToString: _NS("Fit to Screen")] ||
-   [title isEqualToString: _NS("Snapshot")] ||
-   [title isEqualToString: _NS("Fullscreen")] ||
-   [title isEqualToString: _NS("Float on Top")]) {
-bEnabled = FALSE;
+} else if (mi == _half_window   ||
+   mi == _normal_window ||
+   mi == _double_window ||
+   mi == _fittoscreen   ||
+   mi == _snapshot  ||
+   mi == _voutMenusnapshot  ||
+   mi == _fullscreenItem||
+   mi == _voutMenufullscreen||
+

[vlc-commits] macosx: Make AddonManager DescriptionView size smaller

2016-06-26 Thread Marvin Scholz 
vlc | branch: master | Marvin Scholz  | Fri Jun 17 20:24:44 
2016 +0200| [57833cc9efd4fc007bd95886f3d32a02aa92f6b6] | committer: 
Jean-Baptiste Kempf

macosx: Make AddonManager DescriptionView size smaller

This allows the text to fit in the view width, so
that you do not have to scroll horizontally,
which makes it much easier to read descriptions.

Signed-off-by: Jean-Baptiste Kempf 

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

 .../macosx/Resources/English.lproj/AddonManager.xib  |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/AddonManager.xib 
b/extras/package/macosx/Resources/English.lproj/AddonManager.xib
index 60d032b..282e50c 100644
--- a/extras/package/macosx/Resources/English.lproj/AddonManager.xib
+++ b/extras/package/macosx/Resources/English.lproj/AddonManager.xib
@@ -1,9 +1,9 @@
 
-
+
 
 
 
-
+
 
 
 
@@ -28,7 +28,7 @@
 
 
 
-
+
 
 
 
@@ -158,18 +158,18 @@
 
 
 
-
+
 
 
 
 
 
-
-
+
+
 
 
 
-
+
 
 
 Is a million miles from here
@@ -184,7 +184,7 @@ I've never been this far away from home
 
 
 
-
+
 
 
 
@@ -193,7 +193,7 @@ I've never been this far away from home
 
 
 
-
+
 
 
 

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

[vlc-commits] macosx: Remove teletext case from MainMenu validation

2016-06-26 Thread Marvin Scholz 
vlc | branch: master | Marvin Scholz  | Sun Jun 19 12:55:06 
2016 +0200| [601c7b718c8d6218ae1fb1fc1c267c1353582652] | committer: 
Jean-Baptiste Kempf

macosx: Remove teletext case from MainMenu validation

It seems the teletext menu item validation special case is not
necessary at all anymore.
If the parent item is disabled, it does not seem to matter if the
subitems are enabled or not, as access to the subitems is not possible
when the parent is disabled.

Signed-off-by: Jean-Baptiste Kempf 

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

 modules/gui/macosx/MainMenu.m |   11 ---
 1 file changed, 11 deletions(-)

diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index cfb679b..030aa48 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -1630,17 +1630,6 @@
 bEnabled = _openSubtitleFile.isEnabled;
 }
 
-/* Special case for telx menu */
-if ([title isEqualToString: _NS("Normal Size")]) {
-NSMenuItem *item = [[mi menu] itemWithTitle:_NS("Teletext")];
-bool b_telx = p_input && var_GetInteger(p_input, "teletext-es") >= 0;
-
-[[item submenu] setAutoenablesItems:NO];
-
-for (int k=0; k < [[item submenu] numberOfItems]; k++)
-[[[item submenu] itemAtIndex:k] setEnabled: b_telx];
-}
-
 if (p_input)
 vlc_object_release(p_input);
 

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

[vlc-commits] macosx: Remove teletext case from MainMenu validation

2016-06-26 Thread epira...@gmail.com 
vlc | branch: master | epira...@gmail.com  | Sun Jun 19 
12:55:06 2016 +0200| [e961f02bfbce28a0e6e28ef93efff288d9504cb0] | committer: 
Jean-Baptiste Kempf

macosx: Remove teletext case from MainMenu validation

It seems the teletext menu item validation special case is not
necessary at all anymore.
If the parent item is disabled, it does not seem to matter if the
subitems are enabled or not, as access to the subitems is not possible
when the parent is disabled.

Signed-off-by: Jean-Baptiste Kempf 

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

 modules/gui/macosx/MainMenu.m |   11 ---
 1 file changed, 11 deletions(-)

diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index cfb679b..030aa48 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -1630,17 +1630,6 @@
 bEnabled = _openSubtitleFile.isEnabled;
 }
 
-/* Special case for telx menu */
-if ([title isEqualToString: _NS("Normal Size")]) {
-NSMenuItem *item = [[mi menu] itemWithTitle:_NS("Teletext")];
-bool b_telx = p_input && var_GetInteger(p_input, "teletext-es") >= 0;
-
-[[item submenu] setAutoenablesItems:NO];
-
-for (int k=0; k < [[item submenu] numberOfItems]; k++)
-[[[item submenu] itemAtIndex:k] setEnabled: b_telx];
-}
-
 if (p_input)
 vlc_object_release(p_input);
 

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

[vlc-commits] qt: remove the renderer selection dialog

2016-06-26 Thread Steve Lhomme 
vlc | branch: master | Steve Lhomme  | Fri Jun 24 09:55:02 
2016 +0200| [a6ee93bc04a66123dbda2cd6689a845dc3de3b32] | committer: 
Jean-Baptiste Kempf

qt: remove the renderer selection dialog

Signed-off-by: Jean-Baptiste Kempf 

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

 include/vlc_intf_strings.h   |1 -
 modules/gui/qt/Makefile.am   |4 -
 modules/gui/qt/actions_manager.cpp   |3 -
 modules/gui/qt/actions_manager.hpp   |1 -
 modules/gui/qt/components/controller.cpp |4 -
 modules/gui/qt/components/controller.hpp |7 +-
 modules/gui/qt/dialogs/renderer.cpp  |  257 --
 modules/gui/qt/dialogs/renderer.hpp  |   64 
 modules/gui/qt/dialogs_provider.cpp  |8 -
 modules/gui/qt/dialogs_provider.hpp  |3 -
 modules/gui/qt/menus.cpp |5 -
 modules/gui/qt/ui/renderer.ui|   54 ---
 12 files changed, 2 insertions(+), 409 deletions(-)

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

[vlc-commits] qt: scan and select the Renderer via the menu

2016-06-26 Thread Steve Lhomme 
vlc | branch: master | Steve Lhomme  | Thu Jun 23 13:34:04 
2016 +0200| [2a074a43cdae2c399b20395a0056393bbd9ad6ff] | committer: 
Jean-Baptiste Kempf

qt: scan and select the Renderer via the menu

Signed-off-by: Jean-Baptiste Kempf 

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

 modules/gui/qt/actions_manager.cpp |  172 
 modules/gui/qt/actions_manager.hpp |9 +-
 modules/gui/qt/menus.cpp   |   34 +++
 modules/gui/qt/menus.hpp   |3 +
 4 files changed, 217 insertions(+), 1 deletion(-)

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

[vlc-commits] Contribs: fix libmad sound issue

2016-06-26 Thread Shlomi Fish 
vlc | branch: master | Shlomi Fish  | Sun Jun 26 
21:56:08 2016 +0200| [93b8a9a6185a018caad2e6ef929a63e53b31b789] | committer: 
Jean-Baptiste Kempf

Contribs: fix libmad sound issue

Signed-off-by: Jean-Baptiste Kempf 

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

 contrib/src/mad/check-bitstream-length.patch | 1092 +++---
 1 file changed, 994 insertions(+), 98 deletions(-)

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

[vlc-commits] mkv: uncompressed video support

2016-06-26 Thread Tim Allen 
vlc | branch: master | Tim Allen  | Sun Jun 26 12:45:49 
2016 +0100| [3e160ae3cfb2aa9ff23a255cf2cf3ceac0bdf6a6] | committer: Tristan 
Matthews

mkv: uncompressed video support

Signed-off-by: Tristan Matthews 

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

 modules/demux/mkv/matroska_segment_parse.cpp |   16 
 1 file changed, 16 insertions(+)

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp 
b/modules/demux/mkv/matroska_segment_parse.cpp
index 413bd16..6a2a7f1 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -588,6 +588,19 @@ void matroska_segment_c::ParseTrackEntry( KaxTrackEntry *m 
)
 vars.tk->f_fps = __MAX( static_cast( vfps ), 1 );
 debug( vars, "fps=%f", vars.tk->f_fps );
 }
+E_CASE( KaxVideoColourSpace, colourspace )
+{
+if ( colourspace.ValidateSize() )
+{
+char clrspc[5];
+
+vars.tk->fmt.i_codec = GetFOURCC( colourspace.GetBuffer() );
+
+vlc_fourcc_to_char( vars.tk->fmt.i_codec, clrspc );
+clrspc[4]  = '\0';
+debug( vars, "Colour Space=%s", clrspc );
+}
+}
 E_CASE( KaxTrackAudio, tka ) {
 vars.tk->fmt.audio.i_channels = 1;
 vars.tk->fmt.audio.i_rate = 8000;
@@ -1372,6 +1385,9 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk 
)
 S_CASE("V_MJPEG") {
 vars.p_fmt->i_codec = VLC_CODEC_MJPG;
 }
+S_CASE("V_UNCOMPRESSED") {
+msg_Dbg( vars.p_demuxer, "uncompressed format detected");
+}
 S_CASE("A_MS/ACM") {
 mkv_track_t * p_tk = vars.p_tk;
 es_format_t * p_fmt = _tk->fmt;

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