anna/ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
3,033 Commits 9 Branches 131 Tags 139 MiB
b7bd7622b3
Commit Graph

1149 Commits

Author SHA1 Message Date
Anna Schumaker
6fa78dbf3a core/queue: Convert q_cur into a queue iterator 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
8fb64015b4 core/queue: Replace vector with struct _queue 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
0a331a44f5 core/queue: Replace on_track_updated() with qop_updated() 
This patch also removes the now-unused queue notifier class.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
da0c96ac51 core/queue: Replace on_track_removed() with qop_removed() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
df06b444cf core/queue: Replace on_track_added() with qop_added() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
daa09becf7 core/queue: Remove queue destructor 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
6aab58629e core/queue: Move read() and write() into TempQueues 
These functions are only used by temporary queues, and the collection
queue has its own save function.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
acc78a6667 core/queue: Move queue_remove_all() out of the queue struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
ea00b406e5 core/queue: Move queue_remove() out of the queue struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
d5e34b76d4 core/queue: Add Q_ADD_FRONT flag 
This tells the queue to always add tracks at the front.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
8fe85b9782 core/queue: Move queue_add() out of the queue struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
4c4d0ab6ce core/queue: Move queue_sort() out of the queue struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
13723856fc core/queue: Move queue_{set|unset}_flag() out of the queue struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
be5d028fcf core/deck: Wire up the qop_save() function 
So temporary queues can save when flags change or when sorted.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
9451a41ff1 core/collection: Wire up the qop_save() operation 
This will be triggered both when queue flags are changed and when the
queue is sorted.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
ce55ef2421 core/queue: Add queue operations vector 
And a function to help with saving queues.  This patch also adds the
Q_SAVE_FLAGS and Q_SAVE_SORT queue flags to control if the queue should
be saved when flags are changed or when the queue is sorted.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
b3a8fa293b core/queue: Move queue_has_flag() out of the queue struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
3e5bef5f3c core/queue: Move queue_updated() out of the queue struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
ff0c2a09a8 core/queue: Move queue_at() out of the queue struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
c259177dde core/queue: Move queue_size() out of the queue struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
331e56716a core/queue: Move queue_next() out of the queue struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
6bd625f65b core/queue: Move queue_selected() out of the queue struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
d6ae61d915 core/queue: Remove queue :: set_notifier() 
Let's just set the q_notify variable directly, rather than going through
a function.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
a721a95604 core/queue: Remove queue :: length() 
Let's just access the q_length variable directly.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
281947aded core/queue: Convert from class to struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
b586461104 core/containers/queue: Add _q_clear() function 
This is used to clean up the items on a queue, and should be called to
prevent memory leaks.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-25 08:08:28 -05:00
Anna Schumaker
4e8a63cc36 core/tags/track: Expand track_compare() to compare by different fields 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
08c7323dfc core/tags/track: Move comparison fields into track.h 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
9a16a18b9f core/tags/album: Add an album_compare_year() function 
With special handling for albums with the same year but different names.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
f44710f7ae core/containers/queue: Add _q_add_sorted() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
b36869ff93 core/containers/queue: Add _q_sort() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
b7e4a1de23 core/containers/queue: Add _q_remove_it() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
e87e37414d core/containers/queue: Add _q_for_each() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
f26b50bdf8 core/containers/queue: Add _q_iter_set() and _q_iter_val() 
This patch implements basic queue iterator functions for accessing
specific positions on the queue.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
1fefbb6b4a core/containers/queue: Add _q_add_head() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
6a653bd35e core/containers/queue: Add _q_add_tail() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
bf332b36a5 core/containers/queue: Add _q_size() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
79627bb287 core/containers/queue: Add basic queue struct 
This struct is a wrapper around the GQueue container, similar to how we
do sets.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
58a983efd1 core/containers: Move index into the containers/ directory 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
c34f0c160d core/containers: Move database into the containers/ directory 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
f02853e9c7 core/containers: Move set into the containers/ directory 
This patch also creates the containers/ directory

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-15 15:10:44 -05:00
Anna Schumaker
ad5726b542 core: Add core :: deinit() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
a5963a553e core/tags/track: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
b5caf6faed core/tags/track: Convert std::string to gchar * 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
9e3e3e514c core/tags/track: Replace constructor with a backwards pointer 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
800aeda633 core/tags: Move tags_deinit() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
eb349c60e9 core/tags: Move tags_init() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
1b4eb470a7 core/tags/library: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
62fd782710 core/tags/library: Replace std::string with gchar * 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
5cc4efb6ac core/tags/library: Replace constructor with a backwards pointer 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
2755e8a09b core/tags/genre: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
6c3d708576 core/tags/genre: Replace std::string with gchar * 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
e98e74213e core/tags/genre: Replace constructor with a backwards pointer 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
6d9c89392e core/tags/artist: Convert file to C 2016-01-11 09:35:59 -05:00
Anna Schumaker
c07d1e9024 core/tags/artist: Replace std:string with gchar * 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
d404579297 core/tags/artist: Replace constructor with a backwards pointer 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
5309ea5931 core/tags/album: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
ad48d24533 core/tags/album: Replace std::string with gchar * 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
7c3bba11b5 core/tags/album: Replace constructor with a backwards pointer 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
ab837b1a18 core/idle: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
8474ff1907 core/idle: Move idle_schedule() out of the idle namespace 
And rewrite it to use void pointers instead of inheritance.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
8e25c4d89e core/idle: Move idle_run_task() out of the idle queue 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
f17a19fe57 core/idle: Move idle_progress() out of the idle namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
cfd8ca8d43 core/filter: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
91239a392d core/filter: Clean up header file 
Adjust commends and remove the filter namespace.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
f2664aa8f2 core/filter: Move filter_search() out of the filter namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
90afcd6065 core/filter: Move filter_add() out of the filter namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
746c55ac56 core/database: Change db_insert() to insert-by-key 
This means that databases completely manage when memory is allocated.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
bd1de2262d core/tags/track: Wire up the dbe_alloc() database operation 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 09:35:59 -05:00
Anna Schumaker
8e02001373 gui/queue: Stop space bar from selecting new tracks 
From Josh: Single-clicking a track in the collection queue and pressing the
space bar loads the selected track, but users would expect this to
toggle the play / pause state instead.

The solution is to watch for the on_key_press signal and tell GTK that
we have handled it if we see that the space bar was pressed.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-06 10:27:28 -05:00
Anna Schumaker
55a688cdcc core/index: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:19 -05:00
Anna Schumaker
507ac4602d core/index: Replace index_entry constructor with backwards pointer 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:19 -05:00
Anna Schumaker
b28b0c8464 core/database: Add C-style initializer macro 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:19 -05:00
Anna Schumaker
877d9ac1d7 core/database: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:19 -05:00
Anna Schumaker
8dfe818a7a core/database: Replace constructors with a backwards pointer 
This lets me use the struct db_entry without needing an inheritance
system.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:19 -05:00
Anna Schumaker
4a4529b158 core/database: Replace std::map with a glib hash table 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:19 -05:00
Anna Schumaker
9dd9d7d8f7 core/database: Replace std::vector with a glib array 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:19 -05:00
Anna Schumaker
1c22ecfda4 core/database: De-templatize the database 
We now have an interface for controlling everything through struct
db_entry, so let's just have the database store a db_entry directly.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
1bef380ba7 core/database: Introduce the dbe_key() database operation 
And store the result in the db_entry struct for use later.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
f51852f62e core/database: Introduce the dbe_write() database operation 
For writing database entries to disk.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
2da33f1c75 core/database: Introduce the dbe_read() database operation 
This function allocates and returns a new database entry using
information read from a file.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
c77ca65630 core/database: Introduce the dbe_setup() database operation 
Track tags need to add themselves to the filter index and update the
library track count once added to the database.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
c8021639ba core/database: Introduce the dbe_free() database operation 
The Track tag needs to do some cleanup when removed from a database, so
we need to use this op when removing items.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
049156a523 core/database: Introduce the dbe_alloc() database operation 
For allocating new database items from a given key.  Tracks do not need
this function since we have special handling for creation and insertion.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
ab1572ed34 core/database: Add operations vector 
I intend to replace C++ inheritance with this struct of function
pointers.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
847e4c1925 core/database: Remove db_entry::index() function 
Let's just access the dbe_index variable directly.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
3eb27debfb core/database: Convert DatabaseEntry class into a struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
1c0235c8c7 core/tags/generic: Remove Generic tag 
Nothing uses it anymore, so it can be safely removed :)

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:48:18 -05:00
Anna Schumaker
92806c5201 core/tags/track: Clean up constructors 
I replace the standard and copy constructors with one that tags a track
during construction.  This lets me clean up a lot of code, and keep
tagging functions internal to the track class.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
33e20989fa core/tags/track: Directly inherit from DatabaseEntry 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
ee71786c09 core/tags/track: Move track_last_play() out of the track struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
90cdfd4cbd core/tags/track: Move track_path() out of the track struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
c634f5d5e2 core/tags/track: Move track_played() out of the track struct 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
fb4933e418 core/tags/track: Remove track::compare_date() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
24d5c37a6c core/tags/track: Remove variable accessor functions 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
9c1cbbf8cb core/tags/track: Remove tag accessor functions 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
192bdc3ac7 core/tags/track: Replace tags :: track_size() with track_db_get() 
We want to loop over the track database in several places, so let's make
this easier by just returning the database itself.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
eea0f57cf8 core/tags/track: Move track_commit_db() out of tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
d3bdcf2edc core/tags/track: Move track_db_init() out of the tags namespace 
And add the functions track_db_deinit() and tags :: db_deinit().

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00
Anna Schumaker
d0ec3e2cac core/tags/track: Move track_remove_all() out of the tags namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-12-10 16:41:33 -05:00