(cherry picked from commit 37fa606c)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 58fac8cf)

Thanks to David Fuhrmann for the remarks
(cherry picked from commit 5003db86)

macosx: removed the outdated and dysfunctional service discovery menu items from both the playlist and the main menu

(manually cherry-picked from 5e8666c8)

(cherry picked from commit e375b238)

- smaller min size (no need to have this big width here)
- no black borders while resize
(cherry picked from commit c2fe98bd)

Conflicts:

	extras/package/macosx/Resources/English.lproj/MainMenu.xib

(cherry picked from commit 2ea9ea11)

disabling this option will get you a separate video output window without any visible playback controls or window border. resizing is supported through hotkeys and Lion's native mechanism if available. Control the playback through menu and main window controller. Note that 'embedded' is obviously ignored in this mode.
(cherry picked from commit f01f7eca)

(cherry picked from commit 298f3d05)

(cherry picked from commit 962d96bf)

(cherry picked from commit 5ab6bfbd)

(cherry picked from commit 5f138ac2)

(cherry picked from commit b3259ed4)

macosx: removed wrong check, which could make the video output disappear when leaving fullscreen mode in rare cases (close #6856)
(cherry picked from commit 7100a8c8)

With the previous impementation, VLCMainWindow will stay the main window in fullscreen and is accidently activated when closing utility panels.
(cherry picked from commit f2092e10)

(cherry picked from commit 71276f2b)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(cherry picked from commit e52f2154)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(cherry picked from commit a754b006)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(cherry picked from commit 31b5fbdb)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

(Manual merge of fa76779b)

macosx: allow the user to sleep his/her Mac using the Apple Remote using the designated AR event (close #4383)

This code uses NSAppleScript. Hence, it is likely going to be incompatible with the current sandbox implementation.
(cherry picked from commit 9a73999a)

no functional change
(cherry picked from commit 8548e873)

macosx: using the updated SPMediaKeyTap, we can disable the controller on the fly and no longer need to restart VLC to do so (close #6613)
(cherry picked from commit 0aaae8bd)

(cherry picked from commit c6aa5ac9)

(cherry picked from commit 9b56e18b)

This fixes playback rate, track delay and equalizer settings.
(cherry picked from commit fff36451)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

Because somehow strings are used to represent decimals...

Fixes #6815
(cherry picked from commit 78ee8bbd)
Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr>

macosx: fixed corner case, which could lead to an empty main window in case the video output closes prematurely
(cherry picked from commit 5c165066)

(cherry picked from commit cbdadbfb)

(cherry picked from commit 890ea076)

Support for the NSDistributedNotificationCenter based methods
was removed in Growl 1.3.
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit 999170bd)

Conflicts:

	modules/notify/growl.m

Time can be greater than duration, when you scroll right to much.
Furthermore, this commit moves the duplicated code into a own method.
(cherry picked from commit cb98770d)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

This bug is already fixed in VLC 2.1, but the fix is probably too
invasive to be backported.

It can fail in rare circumstances such as context failures (in other
words, PulseAudio daemon crash or exit).
(cherry picked from commit 5a0c690f)

fpathconf (_PC_NAME_MAX) set errno to EBADF. This leads vlc_loaddir() to
misinterpret the result of vlc_readdir() if there are no more files.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

Close #6716
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 83a9c844)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit 1d8fd45b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>