MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Enable dynamic library updating"

Browse Source 
This reverts commit 732ec9239a.
This commit is contained in:
Craig Markwardt 2012-01-01 23:51:34 -05:00
parent 732ec9239a
commit 4eb416a3b3
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/db.c
View File

@ -268,15 +268,6 @@ static const char *sort_clause[] =
static char *db_path; static char *db_path;
static __thread sqlite3 *hdl; static __thread sqlite3 *hdl;
/*
* Starting database revision. A number of 2 ensures that remote clients
* always get a fresh update. (they start with 1)
*/
static int db_rev = 2;
/* Update the database revision number. Don't worry about multiple threads,
we don't care about an accurate count of the number of revisions, just
that revisions have occurred or not. */
#define db_rev_increment() { db_rev ++; }
/* Forward */ /* Forward */
static int static int
@ -288,14 +279,6 @@ db_smartpl_count_items(const char *smartpl_query);
struct playlist_info * struct playlist_info *
db_pl_fetch_byid(int id); db_pl_fetch_byid(int id);
/*
* db_revision_number - return current database revision number to external modules
*/
int
db_revision_number()
{
return db_rev;
}
char * char *
db_escape_string(const char *str) db_escape_string(const char *str)
@ -2024,7 +2007,6 @@ db_file_add(struct media_file_info *mfi)
} }
sqlite3_free(query); sqlite3_free(query);
db_rev_increment();
return 0; return 0;
@ -2099,7 +2081,6 @@ db_file_update(struct media_file_info *mfi)
} }
sqlite3_free(query); sqlite3_free(query);
db_rev_increment();
return 0; return 0;

2
src/db.h
View File

@ -470,8 +470,6 @@ db_watch_enum_end(struct watch_enum *we);
int int
db_watch_enum_fetchwd(struct watch_enum *we, uint32_t *wd); db_watch_enum_fetchwd(struct watch_enum *we, uint32_t *wd);
int
db_revision_number(void);
int int
db_perthread_init(void); db_perthread_init(void);

6
src/httpd_daap.c
View File

@ -65,6 +65,12 @@ extern struct event_base *evbase_httpd;
/* How often we poll for database changes */ /* How often we poll for database changes */
#define DAAP_UPDATE_MONITOR_TIMEOUT 10 #define DAAP_UPDATE_MONITOR_TIMEOUT 10
/* XXX Workaround before adding revision support in db.c;
Client will not get dynamic updates. The state of the
database at the time of connection is all the client
gets. */
#define db_revision_number() (2)
struct uri_map { struct uri_map {
regex_t preg; regex_t preg;
char *regexp; char *regexp;