Simplify prototype definition for taglib_read

navidrome · Nov 13, 2021 · 48a6278 · 48a6278
1 parent 91b470c
commit 48a6278
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/scanner/metadata/taglib/taglib_wrapper.cpp b/scanner/metadata/taglib/taglib_wrapper.cpp
@@ -17,11 +17,7 @@
 
 char has_cover(const TagLib::FileRef f);
 
-#ifdef WIN32
-int taglib_read(const wchar_t *filename, unsigned long id) {
-#else
-int taglib_read(const char *filename, unsigned long id) {
-#endif
+int taglib_read(const FILENAME_CHAR_T *filename, unsigned long id) {
   TagLib::FileRef f(filename, true, TagLib::AudioProperties::Fast);
 
   if (f.isNull()) {

diff --git a/scanner/metadata/taglib/taglib_wrapper.h b/scanner/metadata/taglib/taglib_wrapper.h
@@ -5,15 +5,16 @@
 extern "C" {
 #endif
 
-extern void go_map_put_str(unsigned long id, char *key, char *val);
-extern void go_map_put_int(unsigned long id, char *key, int val);
-
 #ifdef WIN32
-int taglib_read(const wchar_t *filename, unsigned long id);
+#define FILENAME_CHAR_T wchar_t
 #else
-int taglib_read(const char *filename, unsigned long id);
+#define FILENAME_CHAR_T char
 #endif
 
+extern void go_map_put_str(unsigned long id, char *key, char *val);
+extern void go_map_put_int(unsigned long id, char *key, int val);
+int taglib_read(const FILENAME_CHAR_T *filename, unsigned long id);
+
 #ifdef __cplusplus
 }
-#endif
+#endif