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

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

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

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

(cherry picked from commit 58fac8cfd783beffd1840ba688663268513aef83)

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

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

(manually cherry-picked from 5e8666c883f3653b6c9a1e1a94515947df17a20a)

(cherry picked from commit e375b238a70d235f21d3a378c85bd4b8500c90e7)

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

Conflicts:

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

(cherry picked from commit 2ea9ea1117ba6bae74f9dcf7f00e3188bf3a1eb2)

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 f01f7eca64bd6f007afeaaeed623990e76a43de8)

(cherry picked from commit 298f3d05b5dc4a0aa464dc9df1ff5f30b9021d3a)

(cherry picked from commit 962d96bf1137f12810233e04feea1462fa09f6cf)

(cherry picked from commit 5ab6bfbd95919205b92770293c8046696c5b3ebf)

(cherry picked from commit 5f138ac2342473dba543d797c7592e6757289b05)

(cherry picked from commit b3259ed4de03feded83222e6fe0837caabb8d20a)

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

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

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

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

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

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

(Manual merge of fa76779bd62abae33c22b2fa0a4cc44d05d055c7)

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 9a73999a1f22b13051da16feaf54d8dd02e5bc80)

no functional change
(cherry picked from commit 8548e873e73f7e2838fee5e758eeb31ce158f5bb)

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 0aaae8bd58be075548276b3696b9badb998da28f)

(cherry picked from commit c6aa5ac9636a888923e4ae92faccbfbd399d987c)

(cherry picked from commit 9b56e18b3a577cb0f6615b355035f0f23e69b692)

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

Because somehow strings are used to represent decimals...

Fixes #6815
(cherry picked from commit 78ee8bbd0478fda7ff55f8aa0d0a051be6784248)
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 5c165066e19c1935de7abd8142deab531c0265ac)

(cherry picked from commit cbdadbfb0e9f162f1a4151fcb056df56c9e67015)

(cherry picked from commit 890ea0765894d32df2604f0d6d9b9e66eb2f8a37)

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 999170bd706b7d56d50a40a032522be7a379746b)

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 cb98770db2ead84cb01568553ecc26839d9d85e5)
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 5a0c690fb160d2b343b10eda8c986b8b4c7c531c)