Skip to content

Commit 2b2eae0

Browse files
move standard deadbeef hotkey actions from the hotkeys plugin into new statically-linked "core plugin"
1 parent 4a8194e commit 2b2eae0

File tree

8 files changed

+749
-645
lines changed

8 files changed

+749
-645
lines changed

osx/deadbeef.xcodeproj/project.pbxproj

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,9 @@
693693
2D02129C2D9B083A00BAEA12 /* support.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D0212792D9AFBB800BAEA12 /* support.c */; };
694694
2D02129D2D9B083A00BAEA12 /* lyrics.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D0212772D9AFBB800BAEA12 /* lyrics.c */; };
695695
2D0212A02D9B08D700BAEA12 /* lyrics_gtk2.dylib in Copy Plugins */ = {isa = PBXBuildFile; fileRef = 2D0212982D9B07E600BAEA12 /* lyrics_gtk2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
696+
2D0212F72DA0788200BAEA12 /* coreplugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D0212F52DA0788200BAEA12 /* coreplugin.c */; };
697+
2D0212FC2DA0793600BAEA12 /* actionhandlers.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D0212FA2DA0793600BAEA12 /* actionhandlers.h */; };
698+
2D0212FD2DA0793600BAEA12 /* actionhandlers.c in Sources */ = {isa = PBXBuildFile; fileRef = 2D0212FB2DA0793600BAEA12 /* actionhandlers.c */; };
696699
2D026DA91CAC5CB900E27961 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D2A14F019B64F2900AD1EB7 /* libz.dylib */; };
697700
2D026DAB1CAC5CB900E27961 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D026DAA1CAC5CB900E27961 /* libbz2.dylib */; };
698701
2D026DAD1CAC5CDF00E27961 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D026DAC1CAC5CDF00E27961 /* CoreFoundation.framework */; };
@@ -2529,9 +2532,7 @@
25292532
2DE3B80A2269BF3100AFF9AE /* widgets.c in Sources */ = {isa = PBXBuildFile; fileRef = 2DE3B6952269BB4300AFF9AE /* widgets.c */; };
25302533
2DE3B80B2269BF3100AFF9AE /* support.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DE3B6962269BB4300AFF9AE /* support.h */; };
25312534
2DE3B81E2269C0EA00AFF9AE /* utf8.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D1B49E81837EC49003E6066 /* utf8.c */; };
2532-
2DE3B85E2269CA1500AFF9AE /* actionhandlers.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DE3B8422269CA1500AFF9AE /* actionhandlers.h */; };
25332535
2DE3B8622269CA1500AFF9AE /* hotkeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DE3B8482269CA1500AFF9AE /* hotkeys.h */; };
2534-
2DE3B8642269CA1500AFF9AE /* actionhandlers.c in Sources */ = {isa = PBXBuildFile; fileRef = 2DE3B84C2269CA1500AFF9AE /* actionhandlers.c */; };
25352536
2DE3B8652269CA1500AFF9AE /* hotkeys.c in Sources */ = {isa = PBXBuildFile; fileRef = 2DE3B84F2269CA1500AFF9AE /* hotkeys.c */; };
25362537
2DE3B86D2269CA5400AFF9AE /* hotkeys.dylib in Copy Plugins */ = {isa = PBXBuildFile; fileRef = 2DE3B8302269C9FB00AFF9AE /* hotkeys.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
25372538
2DE3B86E2269CA9800AFF9AE /* parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 4D1B51501837EF9D003E6066 /* parser.c */; };
@@ -5418,6 +5419,10 @@
54185419
2D0212782D9AFBB800BAEA12 /* support.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = support.h; sourceTree = "<group>"; };
54195420
2D0212792D9AFBB800BAEA12 /* support.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = support.c; sourceTree = "<group>"; };
54205421
2D0212982D9B07E600BAEA12 /* lyrics_gtk2.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = lyrics_gtk2.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
5422+
2D0212F42DA0788200BAEA12 /* coreplugin.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = coreplugin.h; sourceTree = "<group>"; };
5423+
2D0212F52DA0788200BAEA12 /* coreplugin.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = coreplugin.c; sourceTree = "<group>"; };
5424+
2D0212FA2DA0793600BAEA12 /* actionhandlers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = actionhandlers.h; sourceTree = "<group>"; };
5425+
2D0212FB2DA0793600BAEA12 /* actionhandlers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = actionhandlers.c; sourceTree = "<group>"; };
54215426
2D026D891CAC5BBF00E27961 /* ffmpeg.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = ffmpeg.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
54225427
2D026DAA1CAC5CB900E27961 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; };
54235428
2D026DAC1CAC5CDF00E27961 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
@@ -7059,9 +7064,7 @@
70597064
2DE3B6962269BB4300AFF9AE /* support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = support.h; sourceTree = "<group>"; };
70607065
2DE3B7B92269BC3500AFF9AE /* ddb_gui_GTK3.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = ddb_gui_GTK3.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
70617066
2DE3B8302269C9FB00AFF9AE /* hotkeys.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = hotkeys.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
7062-
2DE3B8422269CA1500AFF9AE /* actionhandlers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actionhandlers.h; sourceTree = "<group>"; };
70637067
2DE3B8482269CA1500AFF9AE /* hotkeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hotkeys.h; sourceTree = "<group>"; };
7064-
2DE3B84C2269CA1500AFF9AE /* actionhandlers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = actionhandlers.c; sourceTree = "<group>"; };
70657068
2DE3B84F2269CA1500AFF9AE /* hotkeys.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hotkeys.c; sourceTree = "<group>"; };
70667069
2DE3B8742269F68B00AFF9AE /* pltbrowser_gtk3.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = pltbrowser_gtk3.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
70677070
2DE3B87D2269F6B900AFF9AE /* support.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = support.c; sourceTree = "<group>"; };
@@ -11125,6 +11128,10 @@
1112511128
4D1B49EE1837EC49003E6066 /* volume.h */,
1112611129
2DA21F5D29868F930077BD4C /* resizable_buffer.h */,
1112711130
2DA21F5E29868F930077BD4C /* resizable_buffer.c */,
11131+
2D0212F42DA0788200BAEA12 /* coreplugin.h */,
11132+
2D0212F52DA0788200BAEA12 /* coreplugin.c */,
11133+
2D0212FA2DA0793600BAEA12 /* actionhandlers.h */,
11134+
2D0212FB2DA0793600BAEA12 /* actionhandlers.c */,
1112811135
);
1112911136
name = src;
1113011137
path = ../src;
@@ -12426,9 +12433,7 @@
1242612433
2DE3B8412269CA1500AFF9AE /* hotkeys */ = {
1242712434
isa = PBXGroup;
1242812435
children = (
12429-
2DE3B8422269CA1500AFF9AE /* actionhandlers.h */,
1243012436
2DE3B8482269CA1500AFF9AE /* hotkeys.h */,
12431-
2DE3B84C2269CA1500AFF9AE /* actionhandlers.c */,
1243212437
2DE3B84F2269CA1500AFF9AE /* hotkeys.c */,
1243312438
);
1243412439
name = hotkeys;
@@ -13563,6 +13568,7 @@
1356313568
2DC65808274A876300583E14 /* DeletePlaylistConfirmationController.h in Headers */,
1356413569
2D98B68C272D573700E655AE /* ScopeSettings.h in Headers */,
1356513570
2DE5562826075B8400285BF9 /* AlbumArtWidget.h in Headers */,
13571+
2D0212FC2DA0793600BAEA12 /* actionhandlers.h in Headers */,
1356613572
2D9EBAAC25E44A0700255592 /* WidgetSerializer.h in Headers */,
1356713573
2DC657F9274A7C4600583E14 /* RenamePlaylistViewController.h in Headers */,
1356813574
2D92D1D529B92A8300218F1D /* viz.h in Headers */,
@@ -14572,7 +14578,6 @@
1457214578
buildActionMask = 2147483647;
1457314579
files = (
1457414580
2DE3B8622269CA1500AFF9AE /* hotkeys.h in Headers */,
14575-
2DE3B85E2269CA1500AFF9AE /* actionhandlers.h in Headers */,
1457614581
);
1457714582
runOnlyForDeploymentPostprocessing = 0;
1457814583
};
@@ -17171,11 +17176,13 @@
1717117176
2D01D7D41AB2219C00BCD3C4 /* conf.c in Sources */,
1717217177
2D135EF0226E47AA00BAAE84 /* scriptable.c in Sources */,
1717317178
2D01D7E31AB2219C00BCD3C4 /* threading_pthread.c in Sources */,
17179+
2D0212FD2DA0793600BAEA12 /* actionhandlers.c in Sources */,
1717417180
2D01D7DF1AB2219C00BCD3C4 /* premix.c in Sources */,
1717517181
2D01D7DC1AB2219C00BCD3C4 /* plmeta.c in Sources */,
1717617182
2D92D33629B931FB00218F1D /* ctmap.c in Sources */,
1717717183
2D01D7D51AB2219C00BCD3C4 /* dsppreset.c in Sources */,
1717817184
2D01D7E01AB2219C00BCD3C4 /* replaygain.c in Sources */,
17185+
2D0212F72DA0788200BAEA12 /* coreplugin.c in Sources */,
1717917186
2D01D7E51AB2219C00BCD3C4 /* vfs.c in Sources */,
1718017187
2D135EF2226E47AA00BAAE84 /* scriptable_dsp.c in Sources */,
1718117188
2D7387EB29BE5DA2003E3126 /* undo_playlist.c in Sources */,
@@ -18521,7 +18528,6 @@
1852118528
isa = PBXSourcesBuildPhase;
1852218529
buildActionMask = 2147483647;
1852318530
files = (
18524-
2DE3B8642269CA1500AFF9AE /* actionhandlers.c in Sources */,
1852518531
2DE3B86E2269CA9800AFF9AE /* parser.c in Sources */,
1852618532
2DE3B8652269CA1500AFF9AE /* hotkeys.c in Sources */,
1852718533
);

plugins/hotkeys/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
if HAVE_HOTKEYS
22
pkglib_LTLIBRARIES = hotkeys.la
3-
hotkeys_la_SOURCES = hotkeys.c hotkeys.h actionhandlers.c actionhandlers.h
3+
hotkeys_la_SOURCES = hotkeys.c hotkeys.h
44
hotkeys_la_LDFLAGS = -module -avoid-version
55

66
EXTRA_hotkeys_la_SOURCES = keysyms.inc

0 commit comments

Comments
 (0)