anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

core/tags/track: Move track_commit_db() out of tags namespace 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-09-28 15:39:26 -04:00
parent d3bdcf2edc
commit eea0f57cf8
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/library.cpp
View File

@ -137,7 +137,7 @@ static void scan_path(struct scan_info &scan)
name = g_dir_read_name(dir);
}
tags :: commit_track_db();
track_db_commit();
}
static void validate_library(struct library *&library)

14
core/tags/track.cpp
View File

@ -100,7 +100,7 @@ void track :: played()
{
tr_count++;
date_today(&tr_date);
tags :: commit_track_db();
track_db_commit();
}
int track :: compare_date(const struct track *rhs)
@ -157,6 +157,11 @@ void track_db_deinit()
db_deinit(&track_db);
}
void track_db_commit()
{
db_save(&track_db);
}
struct track *track_add(struct album *album, struct artist *artist,
struct genre *genre, struct library *library,
const std::string &filepath, const std::string &name,
@ -182,7 +187,7 @@ void track_remove_all(struct library *library)
if (it->library() == library)
db_remove(&track_db, it);
}
tags :: commit_track_db();
track_db_commit();
}
struct track *track_get(const unsigned int index)
@ -194,8 +199,3 @@ unsigned int tags :: track_size()
{
return db_actual_size(&track_db);
}
void tags :: commit_track_db()
{
db_save(&track_db);
}

6
include/core/tags/track.h
View File

@ -124,9 +124,6 @@ namespace tags
* @return The Database::actual_size() of the track_db.
*/
unsigned int track_size();
/** Called to write the track_db to disk. */
void commit_track_db();
}
@ -136,6 +133,9 @@ void track_db_init();
/* Called to clean up the track database. */
void track_db_deinit();
/* Called to commit the track database. */
void track_db_commit();
/* Called to add a track tag to the database. */
struct track *track_add(struct album *, struct artist *, struct genre *,
struct library *, const std::string &,

4
tests/core/tags/track.cpp
View File

@ -146,7 +146,7 @@ static void test_track_tag_lookup()
test_equal(track_get(a->index() + 2), (struct track *)NULL);
test_track_tag_load_db(0);
tags :: commit_track_db();
track_db_commit();
test_track_tag_load_db(2);
@ -154,7 +154,7 @@ static void test_track_tag_lookup()
track_remove(a);
test_equal(track_get(index), (struct track *)NULL);
test_track_tag_load_db(2);
tags :: commit_track_db();
track_db_commit();
test_track_tag_load_db(1);
test_equal(library->li_size, (unsigned)1);
test_equal(tags :: track_size(), b->index() + 1);