Skip to content

Commit 60a8832

Browse files
mac-media-keys: Remove plugin
It was unmaintained for years, uses many deprecated symbols, crashes immediately on start-up on my MacBook and was never enabled by default (both build- and runtime). The new macOS plugin "Now Playing" (commit d71db57) serves as successor.
1 parent 34502d5 commit 60a8832

File tree

12 files changed

+5
-764
lines changed

12 files changed

+5
-764
lines changed

.github/actions/run-action/run-action.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ case "$action" in
4545
export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
4646

4747
if [ "$build_system" = 'meson' ]; then
48-
meson setup build -D qt5=true -D gtk=false -D mac-media-keys=true
48+
meson setup build -D qt5=true -D gtk=false
4949
else
5050
export LDFLAGS="-L/usr/local/opt/libiconv/lib"
5151
export CPPFLAGS="-I/usr/local/opt/libiconv/include"
5252
autoreconf -I "/usr/local/share/gettext/m4" &&
53-
./configure --enable-qt5 --disable-gtk --enable-mac-media-keys
53+
./configure --enable-qt5 --disable-gtk
5454
fi
5555
;;
5656

@@ -59,12 +59,12 @@ case "$action" in
5959
export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@6/libexec/lib/pkgconfig:$PKG_CONFIG_PATH"
6060

6161
if [ "$build_system" = 'meson' ]; then
62-
meson setup build -D gtk=false -D mac-media-keys=true
62+
meson setup build -D gtk=false
6363
else
6464
export LDFLAGS="-L/opt/homebrew/opt/libiconv/lib"
6565
export CPPFLAGS="-I/opt/homebrew/opt/libiconv/include"
6666
autoreconf -I "/opt/homebrew/opt/gettext/share/gettext/m4" &&
67-
./configure --disable-gtk --enable-mac-media-keys
67+
./configure --disable-gtk
6868
fi
6969
;;
7070

configure.ac

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -709,19 +709,8 @@ fi
709709
AC_SUBST(FILEWRITER_CFLAGS)
710710
AC_SUBST(FILEWRITER_LIBS)
711711

712-
dnl Mac Media Keys
713-
dnl ============
714-
715-
AC_ARG_ENABLE(mac_media_keys,
716-
[AS_HELP_STRING([--enable-mac-media-keys], [enable Mac Media Keys])],
717-
[enable_mac_media_keys=$enableval], [enable_mac_media_keys="no"])
718-
719-
if test "x$enable_mac_media_keys" != "xno"; then
720-
GENERAL_PLUGINS="$GENERAL_PLUGINS mac-media-keys"
721-
fi
722-
723712
dnl Mac Now Playing
724-
dnl ============
713+
dnl ===============
725714

726715
AC_ARG_ENABLE(mac_now_playing,
727716
[AS_HELP_STRING([--disable-mac-now-playing], [disable Mac Now Playing (default=enabled)])],
@@ -930,7 +919,6 @@ if test "x$HAVE_DARWIN" = "xyes" ; then
930919
echo " macOS Support"
931920
echo " -------------"
932921
echo " CoreAudio output: $have_coreaudio"
933-
echo " Media Keys: $enable_mac_media_keys"
934922
echo " Now Playing: $enable_mac_now_playing"
935923
echo
936924
fi

meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,6 @@ if meson.version().version_compare('>= 0.53')
351351
if have_darwin
352352
summary({
353353
'CoreAudio Output': get_option('coreaudio'),
354-
'Media Keys': get_option('mac-media-keys'),
355354
'Now Playing': get_option('mac-now-playing'),
356355
}, section: 'macOS Support')
357356
endif

meson_options.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ option('hotkey', type: 'boolean', value: true,
9494
description: 'Whether the global hotkey plugin (X11) is enabled')
9595
option('lirc', type: 'boolean', value: true,
9696
description: 'Whether the LIRC plugin is enabled')
97-
option('mac-media-keys', type: 'boolean', value: false,
98-
description: 'Whether the Mac Media Keys plugin is enabled')
9997
option('mac-now-playing', type: 'boolean', value: true,
10098
description: 'Whether the Mac Now Playing plugin is enabled')
10199
option('mpris2', type: 'boolean', value: true,

src/mac-media-keys/MacMediaKeys.mm

Lines changed: 0 additions & 118 deletions
This file was deleted.

src/mac-media-keys/Makefile

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/mac-media-keys/SPInvocationGrabbing.h

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/mac-media-keys/SPInvocationGrabbing.m

Lines changed: 0 additions & 138 deletions
This file was deleted.

0 commit comments

Comments
 (0)