mpdclient: renamed "updatingdb" to "update_id"

Adopt libmpdclient's name.

diff --git a/src/mpdclient.c b/src/mpdclient.c
index b8d9c6fa2c78118ff3747295445b371c959749b9..e331544be34a3e3168ad25fcea6df859fefe8aa6 100644 (file)
--- a/src/mpdclient.c
+++ b/src/mpdclient.c
@@ -230,11 +230,11 @@ mpdclient_update(struct mpdclient *c)
        if (c->status == NULL)
                return mpdclient_handle_error(c) == 0;
 
-       if (c->updatingdb &&
-           c->updatingdb != mpd_status_get_update_id(c->status))
+       if (c->update_id > 0 &&
+           c->update_id != mpd_status_get_update_id(c->status))
                mpdclient_browse_callback(c, BROWSE_DB_UPDATED, NULL);
 
-       c->updatingdb = mpd_status_get_update_id(c->status);
+       c->update_id = mpd_status_get_update_id(c->status);
        c->volume = mpd_status_get_volume(c->status);
 
        /* check if the playlist needs an update */

diff --git a/src/mpdclient.h b/src/mpdclient.h
index 2679a62e5e45d223582e581fa0ea4723538b7f68..39575b8f8afaa2b8be678df806eba459a3336da5 100644 (file)
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
@@ -21,7 +21,7 @@ struct mpdclient {
        const struct mpd_song *song;
 
        int volume;
-       unsigned updatingdb;
+       unsigned update_id;
 };
 
 /** functions ***************************************************************/

diff --git a/src/screen_client.c b/src/screen_client.c
index 3916304801d8f00cb700ff878866468d20b4cf21..f94ada1c9038f6c7114f5dc9ddb780cd5b35558d 100644 (file)
--- a/src/screen_client.c
+++ b/src/screen_client.c
@@ -75,9 +75,9 @@ screen_database_update(struct mpdclient *c, const char *path)
                return;
        }
 
-       /* set updatingDb to make sure the browse callback gets called
+       /* set update_id to make sure the browse callback gets called
           even if the update has finished before status is updated */
-       c->updatingdb = id;
+       c->update_id = id;
 
        if (path != NULL && *path != 0) {
                char *path_locale = utf8_to_locale(path);