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

1252 Commits

Author SHA1 Message Date
Anna Schumaker
7439a2a73d gui/playlist: Change current playlist when selected 
I also add a function to get the currently selected playlist.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
be6895630d gui/playlist: Begin new playlist sidebar widget 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
3c3f11b958 gui/collection: Remove old collection manager code 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
2cae2cd525 gui/collection: Remove library paths with the Delete key 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
0afe46b5df gui/collection: Toggle library state through the gui 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
8dece02eed gui/collection: Update library paths when rows are clicked 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
f34e2cb57b gui/collection: Change tab page when "Add new Path" is selected 
I also add in code that reuses the current file chooser for picking
paths.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
eb81fa2e20 gui/collection: Add sidebar widget showing Collection header 
And make it non-selectable.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
58d61f52e2 gui/sidebar: Add new sidebar widget 
This is a GtkPaned that remembers its size between Ocarina sessions.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
870a2b769b gui/window: Save width and height between sessions 
Saving maximized state is too complicated, so let's just store width and
height of the window when it is not maximized.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
0c214dd1a9 gui/window: Add gui_window_deinit() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
0c8bcfa552 gui/window: Switch to C-style gtk widgets 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
5e96f40cf8 gui/audio: Unit test can simulate button presses 
This is better than calling audio_*() functions directly, since we can
make sure signals are wired up properly in glade.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 13:39:39 -04:00
Anna Schumaker
50a7c83d61 gui/audio: Convert gst.cpp to audio.c 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 13:16:10 -04:00
Anna Schumaker
5368208a37 gui/gst: Remove gst :: pre_init() and rename gst_init() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 13:12:19 -04:00
Anna Schumaker
dee8b948b0 gui/gst: Remove gst :: toggle() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
aacc1f876a gui/gst: Completely define the play button in glade 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
6723ef88c7 gui/gst: Completely define the pause button in glade 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
8ae31ed483 gui/gst: Completely define the stop button in glade 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
00899873bd gui/gst: Completely define the previous button in glade 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
6680cdbd0e gui/gst: Completely define the next button in glade 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
44d7f9a853 core/gst: Set ban / favorite status when tracks are loaded 
It's easier to do this from the audio code than the plalist code.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
61436d5ccd gui: Switch over to the new gui_builder system 
Glib::wrap() all the things!

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
0eb8521094 gui/builder: Get a widget from the GTK builder 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
d4b27316c0 gui/builder: Get an object from the builder 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
3bc5b1db9e gui/builder: Add new file for accessing the GtkBuilder 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
c479042a86 gui/settings: Add gui_settings_has() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
92c1b64b1a gui/settings: Add functions for setting and getting values 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
f23fb9e0f5 gui/settings: Add new settings file 
The settings layer will track various configuration options set by the
user.  This belongs in the gui, and not core, because it controls
settings specific to this gui implementation.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
711eb67f44 core/queue: Fix queue random and selection test 
6.4.8 changed how random tracks are selected, but never updated the unit
test.  This patch fixes the unit test, and makes a few changes to make
sure the right tracks are getting selected.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-28 08:03:21 -04:00
Anna Schumaker
df2d365b80 tests: Remove test_cp_data_dir() 
This function is unused now.

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
ed5f035855 core/audio: Rename audio_get_player() to test_audio_player() 
Also, let's only have this function when CONFIG_TESTING is enabled.

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
1d76990fd1 core/audio: Add audio_error() to handle error messages 
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
7765c2bf57 core/audio: Remove unused on_error() AudioDriver function 
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
aad90782ba core/collection: Clean up error handling code 
I was assuming that my disk returns -EIO when it enters its failed
state, but it really seems to be return -ENOENT.  Let's have this code
check for any error, rather than one specific one.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-23 09:42:05 -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
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
15f5b8fc87 core/tempq: Switch STL list for glib GSList 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
27eab88b9c core/tempq: Remove unused TempQueue class 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-03-11 10:40:34 -05:00
Anna Schumaker
9633806c2d core/tempq: Merge TempQueue :: read() with tempq_init() 
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
b919843717 core/tempq: Add tempq_deinit() function 
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
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
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
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
3ecb06bcb6 test: Remove library directory creating functions 
Changes to the collections layer mean that I don't need this anymore.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-02-12 09:47:30 -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
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