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

548 Commits

Author SHA1 Message Date
Anna Schumaker
e59617ffa7 gui/model: Add support for gtk_tree_model_get_value() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:36:03 -04:00
Anna Schumaker
9c3adf2b09 gui/model: Add support for gtk_tree_model_get_path() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:35:56 -04:00
Anna Schumaker
eb481b8d09 gui/model: Add support for gtk_tree_model_get_iter() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:35:50 -04:00
Anna Schumaker
ff81af24fc gui/model: Add support for gtk_tree_model_get_column_type() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:35:40 -04:00
Anna Schumaker
6acee801ab gui/model: Add support for gtk_tree_model_get_n_columns() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:35:33 -04:00
Anna Schumaker
f5fba1680a gui/model: Add support for gtk_tree_model_get_flags() 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:35:27 -04:00
Anna Schumaker
ddcb973d8e gui/model: Begin new custom tree model for queues 
I'm not even going to try converting my C++ code.  Let's just start
fresh, and write unit tests as we build this up.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:35:20 -04:00
Anna Schumaker
a313160f94 gui: Put file chooser and notebook onto a stack 
The eventual goal is to replace the notebook, but this is a good start.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:35:14 -04:00
Anna Schumaker
21eb09ced3 gui: Remove old TabToolbar code 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:35:08 -04:00
Anna Schumaker
bc9efade75 gui/queue: Add a switch to enable and disable tempqueues 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:35:01 -04:00
Anna Schumaker
d19e0b2cc0 gui/queue: Add a search entry widget 
This gets cleared every time the queue is changed and disabled when we
show pages that cannot be filtered.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:34:55 -04:00
Anna Schumaker
24f53d88b6 gui/queue: Respond to toggling the random and repeat buttons 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:34:48 -04:00
Anna Schumaker
ddbc040a3b gui/queue: Set state of random and repeat buttons 
I need to change the state of these toggle buttons whenever the
sidebar's current selection changes.  Some gtk themes have trouble
showing the state of toggle buttons, so I change the sensitivity of both
the button and associated image so users know the current state.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-14 07:34:40 -04:00
Anna Schumaker
410a784ede gui/queue: Add flags to the gui queue 
This will be used to determine if the random and random buttons should
be enabled.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-13 16:36:44 -04:00
Anna Schumaker
ce8ec63886 gui/sidebar: Switch over to using the new gui queues 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-13 16:36:44 -04:00
Anna Schumaker
f098811a28 gui: Wire up gui_queue_{alloc|free}() in the queue operations 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-13 16:36:44 -04:00
Anna Schumaker
2d6e42832b gui/queue: Add a text field to the gui queue 
The sidebar is going to look at this when setting queue sizes.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-13 16:36:44 -04:00
Anna Schumaker
f85ad3a9c3 gui/queue: Add a new gui_queue struct 
This will be used to store queue state once I no longer support notebook
tabs.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-13 16:36:44 -04:00
Anna Schumaker
5bc9f65cd9 core/tempq: Add tempq_index() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-13 16:36:44 -04:00
Anna Schumaker
2770403c61 core/tempq: Add tempq ops to queues durinig init 
Rather than setting them after.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-13 16:36:44 -04:00
Anna Schumaker
5419711409 core/queue: Add qop_deinit() queue operation 
This function is used to notify a higher layer that a queue is being
deinitialized.  The higher layer should then clean up any state
associated with that queue.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-13 16:36:44 -04:00
Anna Schumaker
8bb7a20ff4 core/queue: Add qop_init() queue operation 
This function is used to notify a higher layer that a queue has been
initialized.  That higher layer can return a pointer to be attached to
the "private data" field of the queue.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-13 16:36:44 -04:00
Anna Schumaker
25211e93ac gui/collection: Convert checkbox into a right click menu 
This feature isn't used very often, and keeping the checkbox in the
sidebar looks pretty ugly.

Fixes #50: Remove Collection checkbox
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-05 08:27:10 -04:00
Anna Schumaker
d2c4a36945 gui/collection: Add icon to library paths 
I'm surprised this wasn't already there.  I think the "folder" icon
works best, considering library paths are directories in the filesystem.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-04 16:51:52 -04:00
Anna Schumaker
02f5b13650 gui/collection: Remove image size from the collection liststore 
This is to match the playlist treeview.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-05-02 11:18:35 -04:00
Anna Schumaker
79f79405a8 gui/playlist: Remove image size from the playlist liststore 
It's easier just to set all images to have the same size, rather than
making the header's image slightly larger.

Fixes #39: Remove GtkIconSize from Playlist treeview
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 14:58:40 -04:00
Anna Schumaker
b4c81a4441 gui/playlist: Change "Banned" to "Hidden" in the sidebar 
I also update the icon to match what is on the "Hide Track" button.

Fixes #49: Hidden playlist still says "Banned" in sidebar
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 14:42:02 -04:00
Anna Schumaker
16b055f06b gui/sidebar: Add support for removing temporary queues 
Either through the delete key or when the queue runs out of tracks.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
839f4c4aa1 gui/sidebar: Add support for adding temporary queues 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
c663f287d4 gui/sidebar: Add sizes to Collection and History entries 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
eb137c4339 gui/sidebar: Change notebook page through the sidebar 
And make sure other sidebar views are deselected.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
6c653c6a79 gui/sidebar: Add Collection and History entries to the sidebar 
I could do this as a treeview, but creating this as a liststore in glade
is WAY easier!

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
84ff59cf81 gui/playlist_tab: Remove custom list from tab 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
9ee00f9997 gui/sidebar: Add a function for deselecting treeviews 
I'm using multiple treeviews, but only one should be selected at any
time.  Use this function to coordinate that.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
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
fde59a1868 gui/playlist: Add 5 playlists to the sidebar 
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
ca88bca999 gui: Rename playlist.cpp -> playlist_tab.cpp 
I will soon have playlist.c to control the playlist sidebar widgets.

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
8807f06fd6 gui/collection: Update collection on startup 
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
2f9ee44000 gui/collection: Add library paths on startup 
And change to them when selected.

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
480090f78d gui: Rename collection.cpp -> collection_tab.cpp 
I want to create a new file (collection.c) for the collection sidebar
code.

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
684d52c522 gui/window: Convert file to C 
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
066d27a240 gui/window: Move keyboard shortcut handling into tabs.cpp 
I handle the Escape key through gtkbuilder, so let's move the
tab-changing keys into the tabs source file.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-29 13:04:45 -04:00
Anna Schumaker
c01561831c gui/audio: Remove "By:" and "From:" 
I replaced these with images that have similar meanings.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-25 11:38:20 -04:00
Anna Schumaker
6aa64f0bc1 gui/audio: Block accelerators when a gtk entry is focused 
Otherwise pressing the spacebar while searching could toggle the play /
pause status.

Fixes #36: Button accelerators always triggered
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2016-04-12 11:25:49 -04:00
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