From 882ee6e1e7dff97119b5017e042ac126f9dcf600 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Mon, 14 Dec 2015 13:55:50 -0500 Subject: [PATCH] core/tempq: Convert file to C Signed-off-by: Anna Schumaker --- core/audio.cpp | 4 +- core/core.cpp | 2 +- core/{deck.cpp => tempq.c} | 12 +++--- gui/history.cpp | 1 - gui/queue.cpp | 4 +- gui/tabs.cpp | 2 +- gui/window.cpp | 4 +- include/core/{deck.h => tempq.h} | 23 ++++------- tests/core/.gitignore | 2 +- tests/core/Sconscript | 2 +- tests/core/audio.cpp | 2 +- tests/core/{deck.cpp => tempq.c} | 68 ++++++++++++++++---------------- 12 files changed, 59 insertions(+), 67 deletions(-) rename core/{deck.cpp => tempq.c} (96%) rename include/core/{deck.h => tempq.h} (75%) rename tests/core/{deck.cpp => tempq.c} (59%) diff --git a/core/audio.cpp b/core/audio.cpp index 53ee6199..f462a789 100644 --- a/core/audio.cpp +++ b/core/audio.cpp @@ -5,9 +5,9 @@ extern "C" { #include #include -} -#include +#include #include +} static bool _pause_enabled = false; diff --git a/core/core.cpp b/core/core.cpp index c87e9be0..ce351a79 100644 --- a/core/core.cpp +++ b/core/core.cpp @@ -3,13 +3,13 @@ */ #include #include -#include extern "C" { #include #include #include #include #include +#include } diff --git a/core/deck.cpp b/core/tempq.c similarity index 96% rename from core/deck.cpp rename to core/tempq.c index e5d65abd..30ab1f1c 100644 --- a/core/deck.cpp +++ b/core/tempq.c @@ -1,12 +1,10 @@ -/** +/* * Copyright 2013 (c) Anna Schumaker. */ -extern "C" { #include -#include -} -#include #include +#include +#include #include static GSList *tempq_list; @@ -14,7 +12,7 @@ static struct file tempq_file; static struct queue *__tempq_alloc(struct queue_ops *ops, unsigned int flags) { - struct queue *queue = new struct queue; + struct queue *queue = g_malloc(sizeof(struct queue)); tempq_list = g_slist_append(tempq_list, queue); queue_init(queue, flags | Q_ENABLED | Q_SAVE_FLAGS | Q_SAVE_SORT, ops); @@ -25,7 +23,7 @@ static void __tempq_free(struct queue *queue) { tempq_list = g_slist_remove(tempq_list, queue); queue_deinit(queue); - delete queue; + g_free(queue); } static struct queue *__tempq_read_queue() diff --git a/gui/history.cpp b/gui/history.cpp index 294c0b66..38f047e4 100644 --- a/gui/history.cpp +++ b/gui/history.cpp @@ -4,7 +4,6 @@ extern "C" { #include } -#include #include #include diff --git a/gui/queue.cpp b/gui/queue.cpp index 5c3b2095..8c584d15 100644 --- a/gui/queue.cpp +++ b/gui/queue.cpp @@ -1,8 +1,10 @@ /* * Copyright 2014 (c) Anna Schumaker. */ -#include +extern "C" { #include +#include +} #include #include diff --git a/gui/tabs.cpp b/gui/tabs.cpp index 470d5262..3684fb69 100644 --- a/gui/tabs.cpp +++ b/gui/tabs.cpp @@ -1,11 +1,11 @@ /* * Copyright 2014 (c) Anna Schumaker. */ -#include extern "C" { #include #include #include +#include } #include diff --git a/gui/window.cpp b/gui/window.cpp index bf5d4216..115c316f 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -2,8 +2,10 @@ * Copyright 2014 (c) Anna Schumaker. */ #include -#include +extern "C" { +#include #include +} #include #include diff --git a/include/core/deck.h b/include/core/tempq.h similarity index 75% rename from include/core/deck.h rename to include/core/tempq.h index 9ac5b2b1..56b0039c 100644 --- a/include/core/deck.h +++ b/include/core/tempq.h @@ -1,26 +1,19 @@ -/** +/* * Copyright 2013 (c) Anna Schumaker. + * + * The temporary queue manager controls access to any temporary + * queues created by the user. When saving to disk: + * + * length(tempq_list) + * flags num_tracks track_0 track_1 ... track_N + * flags num_tracks track_0 track_1 ... track_N */ #ifndef OCARINA_CORE_DECK_H #define OCARINA_CORE_DECK_H -extern "C" { #include -} -/** - * The deck is used to hold temporary queues created by the user. This - * code is also in charge of maintaining a "recently played" queue of - * songs that have just played. - * - * When saving to disk: - * ... << deck.size() << endl; - * ... << deck[0] << endl; - * ... - * ... << deck[N] <<< endl; - */ - /* Called to initialize the temporary queue manager. */ void tempq_init(struct queue_ops *); diff --git a/tests/core/.gitignore b/tests/core/.gitignore index 79eb8eee..46bd7b8b 100644 --- a/tests/core/.gitignore +++ b/tests/core/.gitignore @@ -2,7 +2,6 @@ audio collection database date -deck driver file filter @@ -14,4 +13,5 @@ queue random set string +tempq version diff --git a/tests/core/Sconscript b/tests/core/Sconscript index 5e0ccf6f..32270481 100644 --- a/tests/core/Sconscript +++ b/tests/core/Sconscript @@ -41,7 +41,7 @@ res += [ CoreTest("queue") ] res += [ CoreTest("playlist") ] res += [ CoreTest("collection") ] res += [ CoreTest("history") ] -res += [ CoreTest("deck") ] +res += [ CoreTest("tempq") ] res += [ CoreTest("audio") ] Return("res") diff --git a/tests/core/audio.cpp b/tests/core/audio.cpp index 47d5f237..384389de 100644 --- a/tests/core/audio.cpp +++ b/tests/core/audio.cpp @@ -8,8 +8,8 @@ extern "C" { #include #include #include +#include } -#include #include "test.h" struct track *TRACK_NULL = NULL; diff --git a/tests/core/deck.cpp b/tests/core/tempq.c similarity index 59% rename from tests/core/deck.cpp rename to tests/core/tempq.c index 0790bbfe..a8e98f1b 100644 --- a/tests/core/deck.cpp +++ b/tests/core/tempq.c @@ -1,16 +1,14 @@ /* * Copyright 2013 (c) Anna Schumaker. */ -#include -extern "C" { #include #include #include #include #include #include -} -#include "test.h" +#include +#include static void test_init() @@ -21,11 +19,11 @@ static void test_init() collection_init(NULL); history_init(NULL); - test_equal(tempq_next(), NULL); + test_equal((void *)tempq_next(), NULL); tempq_init(NULL); - test_equal(tempq_next(), NULL); + test_equal((void *)tempq_next(), NULL); tempq_move(NULL, 1); - test_equal(tempq_get(0), NULL); + test_equal((void *)tempq_get(0), NULL); test_equal(tempq_count(), 0); } @@ -34,21 +32,21 @@ static void test_alloc() struct queue *q0, *q1; q0 = tempq_alloc(NULL, 0); - test_not_equal(q0, NULL); - test_equal(queue_has_flag(q0, Q_ENABLED), true); - test_equal(queue_has_flag(q0, Q_RANDOM), false); - test_equal(queue_has_flag(q0, Q_SAVE_SORT), true); - test_equal(queue_has_flag(q0, Q_SAVE_FLAGS), true); - test_equal(tempq_get(0), q0); + test_not_equal((void *)q0, NULL); + test_equal(queue_has_flag(q0, Q_ENABLED), (bool)true); + test_equal(queue_has_flag(q0, Q_RANDOM), (bool)false); + test_equal(queue_has_flag(q0, Q_SAVE_SORT), (bool)true); + test_equal(queue_has_flag(q0, Q_SAVE_FLAGS), (bool)true); + test_equal((void *)tempq_get(0), (void *)q0); test_equal(tempq_count(), 1); q1 = tempq_alloc(NULL, Q_RANDOM); - test_not_equal(q1, NULL); - test_equal(queue_has_flag(q1, Q_ENABLED), true); - test_equal(queue_has_flag(q1, Q_RANDOM), true); - test_equal(queue_has_flag(q1, Q_SAVE_SORT), true); - test_equal(queue_has_flag(q1, Q_SAVE_FLAGS), true); - test_equal(tempq_get(1), q1); + test_not_equal((void *)q1, NULL); + test_equal(queue_has_flag(q1, Q_ENABLED), (bool)true); + test_equal(queue_has_flag(q1, Q_RANDOM), (bool)true); + test_equal(queue_has_flag(q1, Q_SAVE_SORT), (bool)true); + test_equal(queue_has_flag(q1, Q_SAVE_FLAGS), (bool)true); + test_equal((void *)tempq_get(1), (void *)q1); test_equal(tempq_count(), 2); tempq_deinit(); @@ -57,8 +55,8 @@ static void test_alloc() q0 = tempq_get(0); q1 = tempq_get(1); - test_equal(queue_has_flag(q0, Q_RANDOM), false); - test_equal(queue_has_flag(q1, Q_RANDOM), true); + test_equal(queue_has_flag(q0, Q_RANDOM), (bool)false); + test_equal(queue_has_flag(q1, Q_RANDOM), (bool)true); } static void test_move() @@ -67,14 +65,14 @@ static void test_move() struct queue *q1 = tempq_get(1); tempq_move(q1, 0); - test_equal(tempq_get(0), q1); - test_equal(tempq_get(1), q0); - test_equal(tempq_get(2), NULL); + test_equal((void *)tempq_get(0), (void *)q1); + test_equal((void *)tempq_get(1), (void *)q0); + test_equal((void *)tempq_get(2), NULL); tempq_move(q0, 1); - test_equal(tempq_get(0), q1); - test_equal(tempq_get(1), q0); - test_equal(tempq_get(2), NULL); + test_equal((void *)tempq_get(0), (void *)q1); + test_equal((void *)tempq_get(1), (void *)q0); + test_equal((void *)tempq_get(2), NULL); tempq_deinit(); test_equal(tempq_count(), 0); @@ -82,8 +80,8 @@ static void test_move() q0 = tempq_get(1); q1 = tempq_get(0); - test_equal(queue_has_flag(q0, Q_RANDOM), false); - test_equal(queue_has_flag(q1, Q_RANDOM), true); + test_equal(queue_has_flag(q0, Q_RANDOM), (bool)false); + test_equal(queue_has_flag(q1, Q_RANDOM), (bool)true); } static void test_free() @@ -92,11 +90,11 @@ static void test_free() struct queue *q1 = tempq_get(0); tempq_free(q0); - test_equal(tempq_get(0), q1); + test_equal((void *)tempq_get(0), (void *)q1); test_equal(tempq_count(), 1); tempq_free(q1); - test_equal(tempq_get(0), NULL); + test_equal((void *)tempq_get(0), NULL); test_equal(tempq_count(), 0); tempq_deinit(); @@ -122,17 +120,17 @@ static void test_next() for (i = 0; i < track_db->db_size; i++) { test_loop_equal(queue_size(q0), track_db->db_size - i, i); - test_loop_equal(tempq_next(), track_get(i), i); + test_loop_equal((void *)tempq_next(), (void *)track_get(i), i); } test_loop_passed(); - test_equal(tempq_get(0), q1); + test_equal((void *)tempq_get(0), (void *)q1); test_equal(tempq_count(), 1); test_equal(queue_size(q1), track_db->db_size); for (i = 0; i < track_db->db_size; i++) { test_loop_equal(queue_size(q1), track_db->db_size - i, i); - test_loop_equal(tempq_next(), track_get(i), i); + test_loop_equal((void *)tempq_next(), (void *)track_get(i), i); } test_loop_passed(); - test_equal(tempq_get(0), NULL); + test_equal((void *)tempq_get(0), NULL); test_equal(tempq_count(), 0); tempq_deinit();