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

443 Commits

Author SHA1 Message Date
Anna Schumaker
2097f63f3d gui: Update playlists to say Hidden instead of Banned 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-11 15:34:21 -04:00
Anna Schumaker
627619c391 gui/audio: Convert o_progress widget to use seconds 
This feels better than using units of nanoseconds.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 13:39:43 -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
d8754e9a45 gui/audio: Control keyboard shortcuts from GtkBuilder 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 13:16:30 -04:00
Anna Schumaker
f95a6d02ed gui/audio: Redesign some of the interface 
I moved the location of buttons and text boxes, and also resized some of
the widgets.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 13:16:27 -04:00
Anna Schumaker
286085d248 gui/audio: Configure pause-after-N through glade 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 13:16:25 -04:00
Anna Schumaker
2d45e9e5c4 gui/audio: Pass the progress bar to __audio_timeout 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 13:16:24 -04:00
Anna Schumaker
36b8b29b0b gui/audio: Add __audio prefix to internal functions 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 13:16:22 -04:00
Anna Schumaker
e5e2c87a86 gui/audio: Define seek controls completely in glade 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 13:16:20 -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
c48e128d0a gui/gst: Configure timeout with the C interface 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 13:12:36 -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
bf39724a40 gui/gst: Set ban and favorite buttons through the C interface 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
71c4e6a1aa gui/gst: Completely define the positon and duration labels in glade 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
15da6b4249 gui/gst: Completely define title, artist, and album widgets in glade 
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
f31a67f644 gui/gst: Use C-style gtk widgets 
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
961659bc66 gui/builder: Add a test UI file 
This file creates a button that calls the test_builder_activated()
function when clicked.

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
27e09f47a6 gui/ocarina: Initialize settings on startup 
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
d292879837 gui/settings: Read settings file on startup 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-08 12:03:08 -04:00
Anna Schumaker
a5f0da7a60 gui/settings: Store settings when changed 
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
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