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

419 Commits

Author SHA1 Message Date
Anna Schumaker
b3d95a06d4 core/tempq: Move tempq_next() out of the deck namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
ecda136015 core/tempq: Move tempq_move() out of the deck namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
c22b93b2cf core/tempq: Move tempq_get() out of the deck namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
6bdc481cb4 core/tempq: Make __tempq_index() private 
It has no users outside of unit tests.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
06d62240bb core/tempq: Move tempq_free() out of the deck namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
bce2ba33f7 core/tempq: Move tempq_alloc() out of the deck namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
8c7550d5c3 core/tempq: Move tempq_init() out of the deck namespace 
I also take this opportunity to drop support for upgrading from file
format 0.  I've had several releases since this format was supported, so
this should be safe to do.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
51379c7e8c core/history: Add history_prev() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
c125b3893e core/history: Add history_add() function 
I decided that having a uniqueue history queue doesn't really get me
anything, so I dropped that portion of the behavior.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
75c039f22d core/history: Add history_init() and history_deinit() functions 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
77d4815eb6 core/history: Move history queue into a new file 
I think managing this separately from temporary queues will make the
code simpler.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
8c8ab2a9eb core/idle: Add idle_cancel() function 
This function is used to cancel all idle tasks and free the memory
allocated for them.  This needs to be called when Ocarina is shutting
down to prevent a possible hang with the gtk idle callback continuing to
process tasks.

Fixes #30: Closing Ocarina should cancel idle tasks
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-01 08:27:13 -05:00
Anna Schumaker
b3592e40c0 core/playlist: Rename PL_BANNED -> PL_HIDDEN 
"Banning" a track is a bit harsh.  Let's talking about hiding tracks
instead, so that it sounds friendlier.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-29 13:22:31 -05:00
Anna Schumaker
fef3ef3353 core: Initialize the playlist before the collection 
I think it makes more sense to have the collection manage if banned
tracks are displayed or not, rather than doing this from the playlist
layer.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
beda9bfa3f core/collection: Add functions to ban and unban tracks 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
3b5bbf14af core/playlist: playlist_remove() can return a boolean 
The collection will be using this soon to tell if a track was
successfully unbanned.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
20825613e9 core/playlist: playlist_add() can return a boolean 
There is at least one place in the gui where it needs to know if a track
was actually added to a playlist.  Adding a return value is the best way
to know what happened.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
02c82c182e core/playlist: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
5844402ee3 core/playlist: Merge __playlist_fill() with playlist_static() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
b7a4bb3872 core/playlist: Use playlist_t enum to access playlists 
Using strings is pretty tedious, so let's restrict restrict playlist
access to known values.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
88f6fc526c core/playlist: Add a function to remove banned tracks 
This replaces the get_tracks() function.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
135e0d95d6 core/playlist: Move dynamic playlists out of the PlaylistQueue class 
This lets me remove the PlaylistQueue entirely.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
7a32fdb982 core/playlist: Add dynamic playlist generation unit test 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
73992ed912 core/playlist: Clean up how we fill in static playlists 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
4e6028cf6e core/playlist: Move playlist_remove() out of the playlist namespace 
I also remove redundant unit tests.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
0e3d6251d3 core/playlist: Move playlist_add() out of the playlist namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
82ed2f2dc0 core/playlist: Move playlist_get_queue() out of the playlist namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
6f0b95608a core/playlist: Move playlist_select() out of the playlist namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
1d3a762936 core/playlist: Move playlist_has() out of the playlist namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
1f5ce9e0d1 core/playlist: Add playlist_deinit() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
b1c5d42387 core/playlist: Move playlist_init() out of the playlist namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-26 11:04:42 -05:00
Anna Schumaker
219f8fa119 core/collection: Update collection on startup 
This is much more convenient to users, since they don't need to update
the collection manually.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-23 07:55:56 -05:00
Anna Schumaker
94f22c9fc5 core/collection: Statically initialize c_file 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:47:26 -05:00
Anna Schumaker
696933c6b4 core/collection: Rename library_q -> c_queue 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:47:21 -05:00
Anna Schumaker
7065b6312e core/collection: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:47:16 -05:00
Anna Schumaker
49457751c9 core/collection: Clean up path scanning code 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:47:10 -05:00
Anna Schumaker
8e5cc543c3 core/collection: Fix some memory leaks 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:46:04 -05:00
Anna Schumaker
ffa12a2c38 core/collection: Move file reading code into collection_init() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:37:26 -05:00
Anna Schumaker
79af4513b0 core/collection: Directly save the queue in collection_save() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:37:26 -05:00
Anna Schumaker
f413d14720 core/collection: Move collection_save() out of the collection namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:37:26 -05:00
Anna Schumaker
295a4424ed core/collection: Move collection_get_queue() out of the collection 
namespace

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:37:26 -05:00
Anna Schumaker
89ce6d725c core/collection: Add collection_deinit() 
To clean up the collection queue.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:37:26 -05:00
Anna Schumaker
62f0606cd6 core/collection: move collection_set_enabled() out of the collection 
namespace

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:37:26 -05:00
Anna Schumaker
8a1f5403d0 core/collection: Move collection_update() out of the collection namespace 
And bring collection_update_all() along with it.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:37:26 -05:00
Anna Schumaker
0cb16f5c64 core/collection: Move collection_remove() out of the collection 
namespace

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:37:26 -05:00
Anna Schumaker
6e39e17060 core/collection: Move collection_add() out of the collection namespace 
This patch breaks later tests, since I needed to remove the old ogg
files.  This will be fixed in a few more patches.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:37:26 -05:00
Anna Schumaker
3204fc0e44 core/collection: Move collection_init() out of the collection namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:37:26 -05:00
Anna Schumaker
e47540a84e core/queue: Add queue_clear() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 10:12:09 -05:00
Anna Schumaker
cc164fc4ee core/queue: Add queue_deinit() 
To clean up a queue when we're done with it.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 10:12:00 -05:00
Anna Schumaker
9701da5392 core/queue: Add a function to resort the queue 
This can be combined with the Q_ADD_FRONT flag for efficient bulk
insertions.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
0b84b6180c core/queue: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
Anna Schumaker
799a8d34b5 core/queue: Convert q_sort to a GSList 
I needed to bump the track comparison fields by one so I can use signed
values to indicate sort order.  I updated core/library.cpp to add and
subtract one as needed.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -05:00
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
626eb48933 core/queue: Rewrite unit test 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-29 08:22:10 -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
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
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
eac0b92f0d core/library: Close directory after reading 
We were opening a directory for scanning, but we never closed when we
were done.  If we do this enough then the kernel starts telling us that
there are too many open files.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-01-11 10:03:08 -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