Merge tag 'branchpoint-5.1' into release

[disorder] / lib / trackdb.h

diff --git a/lib/trackdb.h b/lib/trackdb.h
index 6b866516f6d135dcd2209c1b7d74e4375f72a5ef..1a74bb7fd176e74129c5a89656f6ab619f16921f 100644 (file)
--- a/lib/trackdb.h
+++ b/lib/trackdb.h
@@ -61,7 +61,7 @@ extern unsigned long cache_files_hits, cache_files_misses;
 #define TRACKDB_READ_ONLY 0x0020
 
 void trackdb_init(int flags);
 #define TRACKDB_READ_ONLY 0x0020
 
 void trackdb_init(int flags);

-void trackdb_deinit(void);
+void trackdb_deinit(ev_source *ev);

 /* close/close environment */
 
 void trackdb_master(struct ev_source *ev);
 /* close/close environment */
 
 void trackdb_master(struct ev_source *ev);


@@ -148,9 +148,9 @@ int trackdb_rescan_cancel(void);
 void trackdb_gc(void);
 /* tidy up old database log files */
 
 void trackdb_gc(void);
 /* tidy up old database log files */
 

-void trackdb_set_global(const char *name,
-                        const char *value,
-                        const char *who);
+int trackdb_set_global(const char *name,
+                       const char *value,
+                       const char *who);

 /* set a global pref (remove if value=0). */
 
 const char *trackdb_get_global(const char *name);
 /* set a global pref (remove if value=0). */
 
 const char *trackdb_get_global(const char *name);


@@ -159,7 +159,6 @@ const char *trackdb_get_global(const char *name);
 char **trackdb_new(int *ntracksp, int maxtracks);
 
 void trackdb_expire_noticed(time_t when);
 char **trackdb_new(int *ntracksp, int maxtracks);
 
 void trackdb_expire_noticed(time_t when);

-void trackdb_old_users(void);

 void trackdb_create_root(void);
 const char *trackdb_get_password(const char *user);
 int trackdb_adduser(const char *user,
 void trackdb_create_root(void);
 const char *trackdb_get_password(const char *user);
 int trackdb_adduser(const char *user,


@@ -184,9 +183,6 @@ void trackdb_add_rescanned(void (*rescanned)(void *ru),
                            void *ru);
 int trackdb_rescan_underway(void);
 
                            void *ru);
 int trackdb_rescan_underway(void);
 

-int playlist_parse_name(const char *name,
-                        char **ownerp,
-                        char **sharep);

 int trackdb_playlist_get(const char *name,
                          const char *who,
                          char ***tracksp,
 int trackdb_playlist_get(const char *name,
                          const char *who,
                          char ***tracksp,