(cherry picked from commit 5b8a40579cfbacb736484f4210f1cc93e9caf440)

'control' and 'extraintf' will be checked for occurences of 'macosx', which, if found, in turn will be removed. Other contents of these settings won't be touched. Same for all the other prefs.
(cherry picked from commit d864f1cac639f2a8a71727d37c8187de3e56d2ba)

(cherry picked from commit b54ea14fb14faa924b7353a4112ecab8c719b604)

Crash was introduced in 3e73ad2a8ab6d5e50ea80025d364edbe7ead1d1b (subsdelay filter) and
occurs when user or init methods set subsdelay to 0.
(cherry picked from commit fd9f59ec7cbda944c729118302c7434e5696896a)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

(cherry picked from commit 8e6070daf4506090d0ab52dec97d3ca567ed0791)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

If no frame was found in the cluster rewind to previous seekpoint
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 9561207ffd6e431d26dfde2c6b8353b146d9a77b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

popupAddToPlaylist() didn't check for the column of the selected model
indexes when adding items. In the case of the tree view, a selected row
meant selected model indexes for all it's columns, so whatever was
selected was added multiple times.

Close #6408
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 4cc9d5770a108434038e7f5a4e1bf9b3aafa3d8e)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

macosx: prevent intermittent crashes on quit by releasing the main window later, since libvlc can try to access it as long as it is alive
(cherry picked from commit 2ad2a0bd8d9caee51a66e8b0fcd4669f942cbfa0)

(cherry picked from commit d082caf8f4f680bcfbcef9b6e86fafc1b16bca13)

("0 = no subtitles autodetected\n")
(cherry picked from commit 8748391fd5f6d31fad420eb7e23d004a55698774)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

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

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

This bug was unnoticed because this constructor is only called in a situation
where really copying from origin or leaving it to the compiler to set it via
the default constructor leads to the same result (an empty list). Yet, this
was a bug.

It may solve trac #6599 though,
(a Linux port where there is a real initialization issue)
(cherry picked from commit 076851b74bee39d0c911a344063f5e4731dda28a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

However, we still cannot select the full scale.

Close #6603 and #6602
(cherry picked from commit 5deeed2ecd91ca2634fa2e657a8a887e274c226d)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit e908f36fd20d67465af399507ad0a898e86c678b)

additionally, clean up misc.m and move code shared by VLCVoutView, VLBrushedMetalImageView and VLCThreePartDropView to VLCCoreInteraction
(cherry picked from commit c55ac4febf308e50ccc72ff96becf1aeb76faac5)

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

We received already complaints/samples by 4 people in the last week-end...
(cherry picked from commit b4dc61ce93b6706c67139dad1259f1a3b788f18c)
(cherry picked from commit ba1316be2521e153593ca75e588b78d5077caec3)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

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

(cherry picked from commit 9ad094db2b47d5b57f5f8ac53c4a2848b3bffac7)

(cherry picked from commit 4c09ad19963e3940e2ef3be43843d4902afebcd7)

(cherry picked from commit 337aaf7c1ff706467c2c8e3abafff58263277b5b)

(cherry picked from commit e16774656a1e7abc526d1ac0d37755fd38a3e496)

(cherry picked from commit 470ccf4d276b59879a59663082f13e4c0dd78708)

(cherry picked from commit 815b2ce8389f038c12552b26df59fea67a96ad43)

macosx: added 'subsdelay' to the track synchro panel and removed the bogus, non HIG-compliant plus and minux buttons
(cherry picked from commit 3e73ad2a8ab6d5e50ea80025d364edbe7ead1d1b)

(cherry picked from commit 03ad78e9e4799fe3ff713b9b37ec521f7ffb61fd)

macosx: implemented drag & drop from playlist to media library and vice verca. additionally, drag from SD to ML or PL is supported. (close #6044)
(cherry picked from commit 09aae32b04734a520c0087fe12af8deab518bd7d)

macosx: removed VLCControllerView, which was superseeded by VLBrushedMetalImageView and VLCThreePartDropView
(cherry picked from commit 84e84d3fab2140eb7ed4e1bfef2c47adf8ebb9ef)

macosx: refuse file drops on the playlist table if the current root item is neither the local playlist nor the media library
(cherry picked from commit 7bb775484f81f6f848662103355089c191a960d1)

Should close #5952
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 7f99f183c055dbb657a896adb568687b6264df44)

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

Close #6575
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 4599e6a4491fce5a8ae3377e601ab3aa258d33e4)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

(cherry picked from commit c789f858d4a31d65be4af4866573e81ae0bc543d)

Conflicts:

	modules/gui/macosx/open.m

vout_macosx: re-write VOUT_DISPLAY_CHANGE_FULLSCREEN the way it was intended and update the display size correctly, so we get sharp OSD rendering
(cherry picked from commit 4a10b45f3147f524ce09bff7b939d09a3f59f108)

macosx: fixed appearance issue when collapsing / expanding the playlist while it is empty (close #6382)
(cherry picked from commit a80d58fe1365522844c3d504d9bb9f3740fe8316)

macosx: set a sane minimum size for the advanced prefs window, so the options remain useable (close #5994)
(cherry picked from commit 219dd45d31f36be3f93c9331c2ffac4114b42566)

(cherry picked from commit 298ca276a1149034447bd32d9230450a904d33d2)