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

409 Commits

Author SHA1 Message Date
Anna Schumaker
ece432bb22 core/audio: audio_{load, next, prev}() should start playback 
The GUI needed an extra function to do this manually, which means it's
something that core should do instead.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
0cf5187867 core/audio: Add on_state_change() audio operation 
Called to notify when playback state has changed.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
2586348921 core/audio: Convert file to C 
I also convert core/core.c so the audio test can be converted at the
same time.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
a59a71eb38 core/core: Move core_deinit() out of the core namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
04291f4296 core/core: Move core_init() out of the core namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
03196c3efa core/audio: Set up the gstreamer bus for the gui 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
a5556ac10a core/audio: Move audio_eos() out of the AudioDriver 
This change lets me remove the AudioDriver, too.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
276c56406a core/audio: Move audio_pause_after() out of the audio namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
d18d3dd214 core/audio: Move audio_prev() out of the audio namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
3f25369444 core/audio: Move audio_next() out of the audio namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
2511db3a08 core/audio: Add audio_cur_state() function 
This replaces the is_playing() function of the AudioDriver class.  I can
also make the GUIs GstDriver static.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
0a1a9f1394 core/audio: Move audio_cur_track() out of the audio namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
d1d722a163 core/audio: Move audio_stop() out of the audio namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
e1abe94b28 core/audio: Move audio_duration() out of the audio namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
20bb01ef4e core/audio: Move audio_position() out of the audio namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:30 -04:00
Anna Schumaker
566ef3bb50 core/audio: Move audio_seek() out of the audio namespace 2016-03-28 08:01:30 -04:00
Anna Schumaker
9097bd0ffc core/audio: Move audio_pause() out of the audio namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:29 -04:00
Anna Schumaker
16c4c23a42 core/audio: Move audio_play() out of the audio namespace 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:29 -04:00
Anna Schumaker
e5c3d8f02e core/audio: Move audio_load() out of the audio namespace 
And add the on_load() audio operation.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:29 -04:00
Anna Schumaker
e0c89556ed core/audio: Add audio_deinit() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:29 -04:00
Anna Schumaker
d9540b29d6 core/audio: Move audio_init() out of the audio namespace 
I also move the gstreamer playbin back into core/

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:01:29 -04:00
Anna Schumaker
6358124ce8 gui: Check the return code from collection_check_library() 
If the library isn't valid, then we shouldn't try to pick another track
until the user fixes things.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-23 09:58:17 -04:00
Anna Schumaker
08bf842767 gui: Don't update gui if zero tracks were cleared 
I'm seeing Ocarina crash when a tempq finishes and gets removed.  For
now, let's only have the gui handle queue clearing if tracks were
actually removed.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-22 16:04:25 -04:00
Anna Schumaker
76985c8842 gui: Fix setting Q_RANDOM flag 
I had the condition reversed for enabling random on temporary queues, so
the flag was getting set whenever I didn't want it.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-22 09:36:32 -04:00
Anna Schumaker
5979d1dcaf core/collection: Handle -EIO errors coming from the filesystem 
One of my disks frequently returns this error, and has wiped out my
track database on more than one occasion.  Let's handle this error by
disabling the library until the user tells us it is safe to use again.

Fixes #33: Handle music directories disappearing better
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-21 08:36:48 -04:00
Anna Schumaker
2dd4f93bd0 gui: Don't call tempq_save() in the qop_cleared() handler 
The first thing queue_deinit() does is clear the queue, so calling
tempq_save() here will overwrite any tempq state currently on disk.
This seems reasonable at first, but ends up erasing any temporary queues
during Ocarina shutdown.

Fixes #34: Temporary queues not saving
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-17 12:17:11 -04:00
Anna Schumaker
882ee6e1e7 core/tempq: Convert file to C 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
2102b1bfc9 core/tempq: Move tempq_save() out of the deck namespace 
And remove the deck :: write() and TempQueue :: write() functions while
we're at it.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
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
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
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
b191a7f22c gui/ocarina: Deinitialize core first 
This fixes a segfault I was getting when closing ocarina before the
directory scan finishes.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-09 09:59:06 -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
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
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
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
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
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
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