diff --git a/src/db.c b/src/db.c index 125153f0..644223b8 100644 --- a/src/db.c +++ b/src/db.c @@ -295,7 +295,6 @@ static const struct col_type_map qi_cols_map[] = { "bitrate", qi_offsetof(bitrate), DB_TYPE_INT }, { "samplerate", qi_offsetof(samplerate), DB_TYPE_INT }, { "channels", qi_offsetof(channels), DB_TYPE_INT }, - { "usermark", qi_offsetof(usermark), DB_TYPE_INT }, }; /* This list must be kept in sync with @@ -456,7 +455,6 @@ static const struct qi_mfi_map qi_mfi_map[] = { qi_offsetof(bitrate), mfi_offsetof(bitrate), dbmfi_offsetof(bitrate) }, { qi_offsetof(samplerate), mfi_offsetof(samplerate), dbmfi_offsetof(samplerate) }, { qi_offsetof(channels), mfi_offsetof(channels), dbmfi_offsetof(channels) }, - { qi_offsetof(usermark), mfi_offsetof(usermark), dbmfi_offsetof(usermark) }, }; /* This list must be kept in sync with diff --git a/src/db.h b/src/db.h index 1d68cada..3a229510 100644 --- a/src/db.h +++ b/src/db.h @@ -514,8 +514,6 @@ struct db_queue_item { int64_t songartistid; - uint32_t usermark; - /* Not saved in queue table */ uint32_t seek; }; diff --git a/src/db_init.c b/src/db_init.c index ba37f670..f49d846e 100644 --- a/src/db_init.c +++ b/src/db_init.c @@ -200,8 +200,7 @@ " type VARCHAR(8) DEFAULT NULL," \ " bitrate INTEGER DEFAULT 0," \ " samplerate INTEGER DEFAULT 0," \ - " channels INTEGER DEFAULT 0," \ - " usermark INTEGER DEFAULT 0" \ + " channels INTEGER DEFAULT 0" \ ");" #define Q_PL1 \ diff --git a/src/db_upgrade.c b/src/db_upgrade.c index 486df410..f48c99b7 100644 --- a/src/db_upgrade.c +++ b/src/db_upgrade.c @@ -1163,15 +1163,12 @@ static const struct db_upgrade_query db_upgrade_v2106_queries[] = /* ---------------------------- 21.06 -> 21.07 ------------------------------ */ #define U_v2107_ALTER_FILES_USERMARK \ "ALTER TABLE files ADD COLUMN usermark INTEGER DEFAULT 0;" -#define U_v2107_ALTER_QUEUE_USERMARK \ - "ALTER TABLE queue ADD COLUMN usermark INTEGER DEFAULT 0;" #define U_v2107_SCVER_MINOR \ "UPDATE admin SET value = '07' WHERE key = 'schema_version_minor';" static const struct db_upgrade_query db_upgrade_v2107_queries[] = { { U_v2107_ALTER_FILES_USERMARK, "update files adding usermark" }, - { U_v2107_ALTER_QUEUE_USERMARK, "update queue adding usermark" }, { U_v2107_SCVER_MINOR, "set schema_version_minor to 07" }, }; diff --git a/src/httpd_jsonapi.c b/src/httpd_jsonapi.c index c4b86b01..c65c0a29 100644 --- a/src/httpd_jsonapi.c +++ b/src/httpd_jsonapi.c @@ -2222,7 +2222,6 @@ queue_item_to_json(struct db_queue_item *queue_item, char shuffle) json_object_object_add(item, "bitrate", json_object_new_int(queue_item->bitrate)); json_object_object_add(item, "samplerate", json_object_new_int(queue_item->samplerate)); json_object_object_add(item, "channels", json_object_new_int(queue_item->channels)); - json_object_object_add(item, "usermark", json_object_new_int(queue_item->usermark)); return item; }