diff --git a/core/core.cpp b/core/core.cpp index 47f53cf2..91903b12 100644 --- a/core/core.cpp +++ b/core/core.cpp @@ -7,9 +7,9 @@ extern "C" { #include #include +#include #include } -#include void core :: init(struct core_init_data *init) diff --git a/core/playlist.cpp b/core/playlist.c similarity index 97% rename from core/playlist.cpp rename to core/playlist.c index f4658468..f3e39db9 100644 --- a/core/playlist.cpp +++ b/core/playlist.c @@ -1,10 +1,8 @@ -/** +/* * Copyright 2013 (c) Anna Schumaker. */ -extern "C" { #include #include -} #include static struct database playlist_db; @@ -13,7 +11,7 @@ static enum playlist_t playlist_cur; static const gchar *playlist_names[2] = { "Favorites", "Banned" }; -static inline index_entry *__playlist_lookup(enum playlist_t plist) +static inline struct index_entry *__playlist_lookup(enum playlist_t plist) { return INDEX_ENTRY(db_get(&playlist_db, playlist_names[plist])); } diff --git a/gui/collection.cpp b/gui/collection.cpp index 1ce81316..cef4a3e2 100644 --- a/gui/collection.cpp +++ b/gui/collection.cpp @@ -3,8 +3,8 @@ */ extern "C" { #include -} #include +} #include #include diff --git a/gui/manager.cpp b/gui/manager.cpp index 5e1cb426..dee20012 100644 --- a/gui/manager.cpp +++ b/gui/manager.cpp @@ -5,8 +5,8 @@ extern "C" { #include #include #include -} #include +} #include diff --git a/gui/playlist.cpp b/gui/playlist.cpp index 5c14c464..a30e9253 100644 --- a/gui/playlist.cpp +++ b/gui/playlist.cpp @@ -2,7 +2,9 @@ * Copyright 2014 (c) Anna Schumaker. */ #include +extern "C" { #include +} #include #include diff --git a/gui/tabs.cpp b/gui/tabs.cpp index cb6b1bf7..aeff4c88 100644 --- a/gui/tabs.cpp +++ b/gui/tabs.cpp @@ -2,8 +2,8 @@ * Copyright 2014 (c) Anna Schumaker. */ #include -#include extern "C" { +#include #include } #include diff --git a/include/core/playlist.h b/include/core/playlist.h index de92c4f0..93b0d2cd 100644 --- a/include/core/playlist.h +++ b/include/core/playlist.h @@ -1,4 +1,4 @@ -/** +/* * Copyright 2013 (c) Anna Schumaker. * * The playlist manager is in charge of the various playlists Ocarina @@ -8,12 +8,8 @@ #ifndef OCARINA_CORE_PLAYLIST_H #define OCARINA_CORE_PLAYLIST_H -extern "C" { #include #include -} - -#include enum playlist_t { PL_FAVORITED, /* Songs that the user likes. */ diff --git a/tests/core/Sconscript b/tests/core/Sconscript index bc70c3b9..b1e5fa16 100644 --- a/tests/core/Sconscript +++ b/tests/core/Sconscript @@ -26,7 +26,7 @@ res += [ CoreTest("idle", "idle.c") ] res += SConscript("tags/Sconscript") res += [ CoreTest("queue", "queue.c") ] res += [ CoreTest("collection", "collection.c") ] -res += [ CoreTest("playlist", "playlist.cpp") ] +res += [ CoreTest("playlist", "playlist.c") ] res += [ CoreTest("deck", "deck.cpp") ] res += [ CoreTest("audio", "audio.cpp") ] diff --git a/tests/core/playlist.cpp b/tests/core/playlist.c similarity index 82% rename from tests/core/playlist.cpp rename to tests/core/playlist.c index dc1a1087..6a9a6310 100644 --- a/tests/core/playlist.cpp +++ b/tests/core/playlist.c @@ -1,18 +1,16 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -extern "C" { #include #include #include -#include -} #include -#include "test.h" +#include +#include static void test_init() { - queue *q = playlist_get_queue(); + struct queue *q = playlist_get_queue(); GSList *list; filter_init(); @@ -20,10 +18,10 @@ static void test_init() collection_init(NULL); playlist_init(NULL); - test_not_equal(q, NULL); - test_equal(queue_has_flag(q, Q_ENABLED), true); - test_equal(queue_has_flag(q, Q_REPEAT), true); - test_equal(queue_has_flag(q, Q_NO_SORT), true); + test_not_equal((void *)q, NULL); + test_equal(queue_has_flag(q, Q_ENABLED), (bool)true); + test_equal(queue_has_flag(q, Q_REPEAT), (bool)true); + test_equal(queue_has_flag(q, Q_NO_SORT), (bool)true); test_equal(queue_size(q), 0); list = q->q_sort; @@ -46,11 +44,11 @@ static void test_add() struct track *track = track_get(0); playlist_add(PL_FAVORITED, NULL); - test_equal(playlist_has(PL_FAVORITED, NULL), false); + test_equal(playlist_has(PL_FAVORITED, NULL), (bool)false); - test_equal(playlist_has(PL_FAVORITED, track), false); + test_equal(playlist_has(PL_FAVORITED, track), (bool)false); playlist_add(PL_FAVORITED, track); - test_equal(playlist_has(PL_FAVORITED, track), true); + test_equal(playlist_has(PL_FAVORITED, track), (bool)true); test_equal(queue_size(q), 1); playlist_add(PL_FAVORITED, track); test_equal(queue_size(q), 1); @@ -61,9 +59,9 @@ static void test_add() playlist_select(PL_BANNED); test_equal(queue_size(q), 0); test_equal(queue_size(c), 13); - test_equal(playlist_has(PL_BANNED, track), false); + test_equal(playlist_has(PL_BANNED, track), (bool)false); playlist_add(PL_BANNED, track); - test_equal(playlist_has(PL_BANNED, track), true); + test_equal(playlist_has(PL_BANNED, track), (bool)true); test_equal(queue_size(q), 1); test_equal(queue_size(c), 12); @@ -85,9 +83,9 @@ static void test_remove() playlist_select(PL_FAVORITED); test_equal(queue_size(q), 2); - test_equal(playlist_has(PL_FAVORITED, track), true); + test_equal(playlist_has(PL_FAVORITED, track), (bool)true); playlist_remove(PL_FAVORITED, track); - test_equal(playlist_has(PL_FAVORITED, track), false); + test_equal(playlist_has(PL_FAVORITED, track), (bool)false); test_equal(queue_size(q), 1); playlist_remove(PL_FAVORITED, track); @@ -99,9 +97,9 @@ static void test_remove() playlist_select(PL_BANNED); test_equal(queue_size(q), 1); test_equal(queue_size(c), 12); - test_equal(playlist_has(PL_BANNED, track), true); + test_equal(playlist_has(PL_BANNED, track), (bool)true); playlist_remove(PL_BANNED, track); - test_equal(playlist_has(PL_BANNED, track), false); + test_equal(playlist_has(PL_BANNED, track), (bool)false); test_equal(queue_size(q), 0); test_equal(queue_size(c), 13); } @@ -152,7 +150,7 @@ static void test_deinit() filter_deinit(); test_equal(queue_size(q), 0); - test_equal(q->q_sort, NULL); + test_equal((void *)q->q_sort, NULL); } DECLARE_UNIT_TESTS(