[vlc-commits] Fix make dist and POTFILES.in

2015-07-12 Thread David Fuhrmann 
vlc/vlc-2.2 | branch: master | David Fuhrmann  | Sat 
Jul 11 15:00:24 2015 +0200| [451fb8905311779be0871709e327ed0da6fcc34c] | 
committer: David Fuhrmann

Fix make dist and POTFILES.in

(cherry picked from commit 39cafcda8b32a5b3a759ab1dd7dce50e25ed4596)
Signed-off-by: David Fuhrmann 

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

 Makefile.am|1 +
 po/POTFILES.in |2 ++
 2 files changed, 3 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b66c21b..febdc63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,6 +152,7 @@ EXTRA_DIST += \
extras/package/macosx/Resources/English.lproj/PlaylistAccessoryView.xib 
\
extras/package/macosx/Resources/English.lproj/PlaylistMenu.xib \
extras/package/macosx/Resources/English.lproj/Preferences.xib \
+   extras/package/macosx/Resources/English.lproj/ResumeDialog.xib \
extras/package/macosx/Resources/English.lproj/SharedDialogs.xib \
extras/package/macosx/Resources/English.lproj/SyncTracks.xib \
extras/package/macosx/Resources/English.lproj/VideoEffects.xib \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0a7c635..62e813e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -586,6 +586,8 @@ modules/gui/macosx/prefs.h
 modules/gui/macosx/prefs.m
 modules/gui/macosx/prefs_widgets.h
 modules/gui/macosx/prefs_widgets.m
+modules/gui/macosx/ResumeDialogController.h
+modules/gui/macosx/ResumeDialogController.m
 modules/gui/macosx/simple_prefs.h
 modules/gui/macosx/simple_prefs.m
 modules/gui/macosx/StringUtility.h

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

[vlc-commits] macosx: remove stray code

2015-07-12 Thread David Fuhrmann 
vlc/vlc-2.2 | branch: master | David Fuhrmann  | Sat 
Jul 11 15:25:26 2015 +0200| [3187904de00605a00ee41ad40aa7da65fa11a671] | 
committer: David Fuhrmann

macosx: remove stray code

(cherry picked from commit 52a35891a4ef1f95e0c677af47837270536a)
Signed-off-by: David Fuhrmann 

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

 modules/gui/macosx/playlist.h |2 --
 modules/gui/macosx/playlist.m |   16 
 2 files changed, 18 deletions(-)

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index 59e7276..d84c5de 100644
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -105,8 +105,6 @@
 IBOutlet id o_save_accessory_text;
 
 IBOutlet id o_playlist_header;
-
-int currentResumeTimeout;
 }
 
 - (void)searchfieldChanged:(NSNotification *)o_notification;
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 8a31ece..2b652c6 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1506,22 +1506,6 @@
 return YES;
 }
 
-- (void)updateAlertWindow:(NSTimer *)timer
-{
-NSAlert *alert = [timer userInfo];
-
---currentResumeTimeout;
-if (currentResumeTimeout <= 0) {
-[[alert window] close];
-[NSApp abortModal];
-}
-
-NSString *buttonLabel = _NS("Restart playback");
-buttonLabel = [buttonLabel stringByAppendingFormat:@" (%d)", 
currentResumeTimeout];
-
-[[[alert buttons] objectAtIndex:2] setTitle:buttonLabel];
-}
-
 - (void)continuePlaybackWhereYouLeftOff:(input_thread_t *)p_input_thread
 {
 NSDictionary *recentlyPlayedFiles = [[NSUserDefaults standardUserDefaults] 
objectForKey:@"recentlyPlayedMedia"];

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

[vlc-commits] macosx: Create custom resume dialog, refactor

2015-07-12 Thread David Fuhrmann 
vlc/vlc-2.2 | branch: master | David Fuhrmann  | Sat 
Jul 11 14:32:20 2015 +0200| [f5ebfa8e5648665c49c4c9474313d7850799b83a] | 
committer: David Fuhrmann

macosx: Create custom resume dialog, refactor

Create own resume dialog, which acts the same way as a floating
window. Thus it does not disturb the user more than any
other VLC panel and consequently does not block the user in doing
other operations.

This fixes floating behaviour (#13886) any makes it more easy
to implement any other fancy_dialog_whatever we might add later.
Current design is a copy of the currently used alert window.

Also raised the timeout value to 10 secs as users are complaining
6 sec is not long enough.

close #13886

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

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

 .../Resources/English.lproj/ResumeDialog.xib   |  699 
 .../package/macosx/vlc.xcodeproj/project.pbxproj   |   16 +
 modules/gui/macosx/Modules.am  |2 +
 modules/gui/macosx/ResumeDialogController.h|   57 ++
 modules/gui/macosx/ResumeDialogController.m|  126 
 modules/gui/macosx/VLCVoutWindowController.m   |4 +
 modules/gui/macosx/intf.h  |4 +
 modules/gui/macosx/intf.m  |   11 +
 modules/gui/macosx/playlist.m  |   41 +-
 9 files changed, 935 insertions(+), 25 deletions(-)

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

[vlc-commits] macosx: resume dialog: make more space for l10n

2015-07-12 Thread David Fuhrmann 
vlc/vlc-2.2 | branch: master | David Fuhrmann  | Sun 
Jul 12 19:16:57 2015 +0200| [addc6b0001c9dd16d674316f2856ac004d41faf3] | 
committer: David Fuhrmann

macosx: resume dialog: make more space for l10n

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

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

 .../Resources/English.lproj/ResumeDialog.xib   |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib 
b/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
index 9ad09c2..7b180cd 100644
--- a/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
+++ b/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
@@ -41,7 +41,7 @@

1
2
-   {{196, 240}, {650, 
145}}
+   {{196, 240}, {684, 
133}}
-529006592

NSWindow
@@ -54,7 +54,7 @@


268
-   {{102, 56}, {530, 44}}
+   {{102, 49}, {564, 39}}



@@ -63,11 +63,11 @@

67108864
272629760
-   Do you want to resume this file?
+   Do you want to resume this file?
This-is-a-file

YES
12
-   4883
+   787

_NS:1535

@@ -96,7 +96,7 @@


268
-   {{98, 12}, {167, 32}}
+   {{98, 13}, {216, 32}}



@@ -125,7 +125,7 @@


268
-   {{301, 12}, {173, 32}}
+   {{350, 13}, {160, 32}}



@@ -150,7 +150,7 @@


268
-   {{474, 12}, {162, 32}}
+   {{510, 13}, {160, 32}}



@@ -175,7 +175,7 @@


268
-   {{102, 108}, {530, 17}}
+   {{102, 96}, {564, 17}}



@@ -209,7 +209,7 @@
NeXT 
Encapsulated PostScript v1.2 pasteboard type
NeXT 
TIFF v4.0 pastebo

[vlc-commits] macosx: resume dialog: make more space for l10n

2015-07-12 Thread David Fuhrmann 
vlc | branch: master | David Fuhrmann  | Sun Jul 12 
19:16:57 2015 +0200| [a2aa300a401f1df6d88cb168d8bee7184c2206c6] | committer: 
David Fuhrmann

macosx: resume dialog: make more space for l10n

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

 .../Resources/English.lproj/ResumeDialog.xib   |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib 
b/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
index 9ad09c2..7b180cd 100644
--- a/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
+++ b/extras/package/macosx/Resources/English.lproj/ResumeDialog.xib
@@ -41,7 +41,7 @@

1
2
-   {{196, 240}, {650, 
145}}
+   {{196, 240}, {684, 
133}}
-529006592

NSWindow
@@ -54,7 +54,7 @@


268
-   {{102, 56}, {530, 44}}
+   {{102, 49}, {564, 39}}



@@ -63,11 +63,11 @@

67108864
272629760
-   Do you want to resume this file?
+   Do you want to resume this file?
This-is-a-file

YES
12
-   4883
+   787

_NS:1535

@@ -96,7 +96,7 @@


268
-   {{98, 12}, {167, 32}}
+   {{98, 13}, {216, 32}}



@@ -125,7 +125,7 @@


268
-   {{301, 12}, {173, 32}}
+   {{350, 13}, {160, 32}}



@@ -150,7 +150,7 @@


268
-   {{474, 12}, {162, 32}}
+   {{510, 13}, {160, 32}}



@@ -175,7 +175,7 @@


268
-   {{102, 108}, {530, 17}}
+   {{102, 96}, {564, 17}}



@@ -209,7 +209,7 @@
NeXT 
Encapsulated PostScript v1.2 pasteboard type
NeXT 
TIFF v4.0 pasteboard type

-

[vlc-commits] macosx: remove stray code

2015-07-12 Thread David Fuhrmann 
vlc | branch: master | David Fuhrmann  | Sat Jul 11 
15:25:26 2015 +0200| [52a35891a4ef1f95e0c677af47837270536a] | committer: 
David Fuhrmann

macosx: remove stray code

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

 modules/gui/macosx/playlist.h |2 --
 modules/gui/macosx/playlist.m |   16 
 2 files changed, 18 deletions(-)

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index a89c317..f22e4e7 100644
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -75,8 +75,6 @@
 
 IBOutlet id o_playlist_header;
 
-int currentResumeTimeout;
-
 PLModel *o_model;
 }
 
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 3f3afa7..0bbcb9c 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -946,22 +946,6 @@
 return YES;
 }
 
-- (void)updateAlertWindow:(NSTimer *)timer
-{
-NSAlert *alert = [timer userInfo];
-
---currentResumeTimeout;
-if (currentResumeTimeout <= 0) {
-[[alert window] close];
-[NSApp abortModal];
-}
-
-NSString *buttonLabel = _NS("Restart playback");
-buttonLabel = [buttonLabel stringByAppendingFormat:@" (%d)", 
currentResumeTimeout];
-
-[[[alert buttons] objectAtIndex:2] setTitle:buttonLabel];
-}
-
 - (void)continuePlaybackWhereYouLeftOff:(input_thread_t *)p_input_thread
 {
 NSDictionary *recentlyPlayedFiles = [[NSUserDefaults standardUserDefaults] 
objectForKey:@"recentlyPlayedMedia"];

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

[vlc-commits] demux: wav: debug print waveformatex guid

2015-07-12 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Sun Jul 12 
13:48:49 2015 +0200| [d5a10c74cccef52678c24675580eda6ae384c877] | committer: 
Francois Cartegnie

demux: wav: debug print waveformatex guid

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

 modules/demux/wav.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index 328bafd..9539d9c 100644
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -215,6 +215,8 @@ static int Open( vlc_object_t * p_this )
 
 sf_tag_to_fourcc( &guid_subformat, &p_sys->fmt.i_codec, &psz_name );
 
+msg_Dbg( p_demux, "extensible format guid " GUID_FMT, 
GUID_PRINT(guid_subformat) );
+
 i_extended = sizeof( WAVEFORMATEXTENSIBLE ) - sizeof( WAVEFORMATEX );
 p_sys->fmt.i_extra -= i_extended;
 

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

[vlc-commits] vlc_codecs: fix the waveformatex, ksformat stuff

2015-07-12 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Sun Jul 12 
11:19:46 2015 +0200| [52847eaf50656cb3ecedea906f05f0aec180480c] | committer: 
Francois Cartegnie

vlc_codecs: fix the waveformatex, ksformat stuff

Were unused static Guids, incorrect Atrac3 to pcm mapping
constness, and incomplete waveformat->guid mapping.

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

 include/vlc_codecs.h |   68 ++
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index c1fe6a2..5721c1e 100644
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -308,27 +308,9 @@ ATTR_PACKED
 #endif
 
 /* GUID SubFormat IDs */
-/* We need both b/c const variables are not compile-time constants in C, giving
- * us an error if we use the const GUID in an enum */
-
-#ifndef _KSDATAFORMAT_SUBTYPE_PCM_
-#define _KSDATAFORMAT_SUBTYPE_PCM_ {0x0001, 0x, 0x0010, {0x80, 0x00, 
0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}
-static const GUID VLC_KSDATAFORMAT_SUBTYPE_PCM = {0xE923AABF, 0xCB58, 0x4471, 
{0xA1, 0x19, 0xFF, 0xFA, 0x01, 0xE4, 0xCE, 0x62}};
-#define KSDATAFORMAT_SUBTYPE_PCM VLC_KSDATAFORMAT_SUBTYPE_PCM
-#endif
-
-#ifndef _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT_
-#define _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT_ {0x0003, 0x, 0x0010, {0x80, 
0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}
-static const GUID VLC_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x0003, 0x, 
0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
-#define KSDATAFORMAT_SUBTYPE_IEEE_FLOAT VLC_KSDATAFORMAT_SUBTYPE_PCM
-#endif
-
-
-#ifndef _KSDATAFORMAT_SUBTYPE_UNKNOWN_
-#define _KSDATAFORMAT_SUBTYPE_UNKNOWN_ {0x, 0x, 0x, {0x00, 
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
-static const GUID VLC_KSDATAFORMAT_SUBTYPE_UNKNOWN = {0x, 0x, 
0x, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-#define KSDATAFORMAT_SUBTYPE_UNKNOWN VLC_KSDATAFORMAT_SUBTYPE_UNKNOWN
-#endif
+#define VLC_KSDATAFORMAT_SUBTYPE_ATRAC3P {0xE923AABF, 0xCB58, 0x4471, {0xA1, 
0x19, 0xFF, 0xFA, 0x01, 0xE4, 0xCE, 0x62}} /* Undocumented */
+#define VLC_KSDATAFORMAT_SUBTYPE_UNKNOWN {0x, 0x, 0x, {0x00, 
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
+#define VLC_WAVEFORMATEX_GUIDBASE{0x, 0x, 0x0010, {0x80, 
0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}} /* Generated from Wave Format */
 
 /* Microsoft speaker definitions */
 #define WAVE_SPEAKER_FRONT_LEFT 0x1
@@ -456,22 +438,26 @@ static inline void fourcc_to_wf_tag( vlc_fourcc_t fcc, 
uint16_t *pi_tag )
  */
 static const struct
 {
-GUID guid_tag;
-vlc_fourcc_t i_fourcc;
+const GUID   guid_tag;
+const vlc_fourcc_t i_fourcc;
 const char  *psz_name;
 }
 sub_format_tag_to_fourcc[] =
 {
-{ _KSDATAFORMAT_SUBTYPE_PCM_, VLC_FOURCC( 'a', 'r', 'a', 'w' ), "PCM" },
-{ _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT_, VLC_FOURCC( 'a', 'f', 'l', 't' ), 
"Float PCM" },
-{ _KSDATAFORMAT_SUBTYPE_UNKNOWN_, VLC_FOURCC( 'u', 'n', 'd', 'f' ), 
"Unknown" }
+{ VLC_KSDATAFORMAT_SUBTYPE_ATRAC3P, VLC_CODEC_ATRAC3P,
"Sony Atrac3+" },
+{ VLC_KSDATAFORMAT_SUBTYPE_UNKNOWN, VLC_FOURCC( 'u', 'n', 'd', 'f' ), 
"Unknown" }
 };
 
+static inline int guidcmpbase( const GUID *s1, const GUID *s2 )
+{
+return( s1->Data2 == s2->Data2 &&
+s1->Data3 == s2->Data3 && !memcmp( s1->Data4, s2->Data4, 8 ) );
+}
+
 /* compares two GUIDs, returns 1 if identical, 0 otherwise */
 static inline int guidcmp( const GUID *s1, const GUID *s2 )
 {
-return( s1->Data1 == s2->Data1 && s1->Data2 == s2->Data2 &&
-s1->Data3 == s2->Data3 && !memcmp( s1->Data4, s2->Data4, 8 ) );
+return( s1->Data1 == s2->Data1 && guidcmpbase( s1, s2 ) );
 }
 
 #define GUID_FMT "0x%x-0x%x-0x%x-0x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x"
@@ -483,18 +469,34 @@ static inline int guidcmp( const GUID *s1, const GUID *s2 
)
 (guid).Data4[4],(guid).Data4[5],(guid).Data4[6],(guid).Data4[7]
 
 
-static inline void sf_tag_to_fourcc( GUID *guid_tag,
+static inline void sf_tag_to_fourcc( const GUID *guid_tag,
  vlc_fourcc_t *fcc, const char **ppsz_name 
)
 {
 int i;
+bool b_found = false;
+
+const GUID unknown = VLC_KSDATAFORMAT_SUBTYPE_UNKNOWN;
+const GUID waveformatex = VLC_WAVEFORMATEX_GUIDBASE;
 
 for( i = 0; !guidcmp( &sub_format_tag_to_fourcc[i].guid_tag,
-  &KSDATAFORMAT_SUBTYPE_UNKNOWN ); i++ )
+  &unknown ); i++ )
+{
+if( guidcmp( &sub_format_tag_to_fourcc[i].guid_tag, guid_tag ) )
+{
+b_found = true;
+break;
+}
+}
+
+if( !b_found && guidcmpbase(guid_tag, &waveformatex) )
+{
+wf_tag_to_fourcc(guid_tag->Data1, fcc, ppsz_name);
+}
+else
 {
-if( guidcmp( &sub_format_tag_to_fourcc[i].guid_tag, guid_tag ) ) break;
+if( fcc ) *fcc = sub_form

[vlc-commits] demux: wav: map atrac3+ (fix #15001)

2015-07-12 Thread Francois Cartegnie 
vlc | branch: master | Francois Cartegnie  | Sun Jul 12 
14:09:13 2015 +0200| [1f9c93f31bdc089aab6b7e4d0893044b20589596] | committer: 
Francois Cartegnie

demux: wav: map atrac3+ (fix #15001)

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

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

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index 9539d9c..827bf72 100644
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -360,6 +360,7 @@ static int Open( vlc_object_t * p_this )
 case VLC_CODEC_GSM_MS:
 case VLC_CODEC_ADPCM_G726:
 case VLC_CODEC_TRUESPEECH:
+case VLC_CODEC_ATRAC3P:
 case VLC_CODEC_ATRAC3:
 case VLC_CODEC_G723_1:
 case VLC_CODEC_WMA2:

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