build fixes

DeaDBeeF-Player · Feb 8, 2024 · f6e242a · f6e242a
1 parent 22a4994
commit f6e242a
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -941,6 +941,7 @@ shared/analyzer/Makefile
 shared/scope/Makefile
 shared/scriptable/Makefile
 shared/undo/Makefile
+shared/filereader/Makefile
 external/Makefile
 external/ddb_dsp_libretro/Makefile
 external/ddb_output_pw/Makefile

diff --git a/plugins/cocoaui/Playlist/DdbPlayItemPasteboardSerializer.h b/plugins/cocoaui/Playlist/DdbPlayItemPasteboardSerializer.h
@@ -9,6 +9,9 @@
 #import <Foundation/Foundation.h>
 #include <deadbeef/deadbeef.h>
 
+/// Serialize/deserialize an array of playItems as playlist.
+/// The resulting items would not be the same memory locations after serialization,
+/// since they go through playlist saving and loading procedure.
 @interface DdbPlayItemPasteboardSerializer : NSObject<NSPasteboardReading, NSPasteboardWriting, NSSecureCoding>
 
 @property (nonnull,nonatomic,readonly) ddb_playlist_t *plt;

diff --git a/plugins/cocoaui/Playlist/DdbPlayItemPasteboardSerializer.m b/plugins/cocoaui/Playlist/DdbPlayItemPasteboardSerializer.m
@@ -64,6 +64,7 @@ - (void)dealloc
         deadbeef->plt_unref (self.plt);
     }
 }
+
 // NSCoding
 
 - (instancetype)initWithCoder:(NSCoder *)aDecoder {

diff --git a/premake5.lua b/premake5.lua
@@ -195,6 +195,7 @@ project "deadbeef"
     "src/md5/*.c",
     "src/undo/*.c",
     "shared/undo/*.c",
+    "shared/filereader/*.c",
     "src/*.c",
     "plugins/libparser/*.c",
     "external/wcwidth/wcwidth.c",

diff --git a/shared/Makefile.am b/shared/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = analyzer scope scriptable undo
+SUBDIRS = analyzer scope scriptable undo filereader
 
 noinst_LTLIBRARIES = libmp4tagutil.la libtrkpropertiesutil.la libeqpreset.la libctmap.la libdeletefromdisk.la libtftintutil.la
 

diff --git a/shared/filereader/Makefile.am b/shared/filereader/Makefile.am
@@ -0,0 +1,7 @@
+noinst_LTLIBRARIES = libfilereader.la
+
+libfilereader_la_SOURCES = \
+	filereader.c filereader.h
+
+libfilereader_la_CFLAGS = -fPIC -std=c99 -I@top_srcdir@/include $(DISPATCH_CFLAGS)
+
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -38,7 +38,7 @@ deadbeef_SOURCES =\
 	viz.c viz.h\
 	undo/undo_playlist.c undo/undo_playlist.h
 
-deadbeef_LDADD = $(LDADD) $(ICONV_LIB) $(DL_LIBS) -lm -lpthread $(DISPATCH_LIBS) $(LTLIBINTL) ../shared/libctmap.la ../shared/undo/libundo.la ../plugins/libparser/libparser.la
+deadbeef_LDADD = $(LDADD) $(ICONV_LIB) $(DL_LIBS) -lm -lpthread $(DISPATCH_LIBS) $(LTLIBINTL) ../shared/libctmap.la ../shared/undo/libundo.la ../shared/filereader/libfilereader.la ../plugins/libparser/libparser.la
 
 deadbeef_CFLAGS = $(DEPS_CFLAGS) $(DISPATCH_CFLAGS) -std=c99 -DLOCALEDIR=\"@localedir@\" -I@top_srcdir@/include -I@top_srcdir@/shared -I@top_srcdir@
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,6 +64,7 @@ - (void)dealloc @@
             deadbeef->plt_unref (self.plt);
         }
     }
     // NSCoding
     - (instancetype)initWithCoder:(NSCoder *)aDecoder {
@@ Expand Down @@