anna/ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
2,622 Commits 9 Branches 131 Tags 139 MiB
99a1349336
Commit Graph

863 Commits

Author SHA1 Message Date
Anna Schumaker
7e58a4fef8 filter: Simplify adding words to the filter 
I can use the lowercase text from string :: lowercase() and take a
single pass over a single string (rather than iterating through a list
of strings).

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-30 10:54:38 -05:00
Anna Schumaker
7733e24c07 string: Add a lowercase() function 
This function strips out special characters and returns the lowercase
version of the string.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-30 09:32:50 -05:00
Anna Schumaker
cc6f4c9293 string: Add a function for creating a detailed time string 
I use this to display the total running time of queues in the gui.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-29 08:27:25 -05:00
Anna Schumaker
12260a3de9 string: Add a function for converting seconds to string 
This is used to get a string representation of the number of seconds
passed in.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-27 09:23:14 -05:00
Anna Schumaker
6c6437c2bd string: Create a utos() function 
This function converts unsigned ints into strings.  This allows me to
replace several almost identical functions with one function call.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-27 08:37:27 -05:00
Anna Schumaker
77fc2fff5c version: Add a "+" to version string 
I use this to show that there have been any changes since the last
release.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-26 08:43:14 -05:00
Anna Schumaker
e6d9a58be2 gui: Remove CONFIG_TEST macros 
I haven't had gui unit tests in months, so these can be removed for now.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-21 08:43:55 -05:00
Anna Schumaker
74a557739d lib: Remove rest of lib/ 
This is all contained in the gui code now.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-21 08:39:02 -05:00
Anna Schumaker
dc3e770c28 gui: Move GtkBuilder object into the gui 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-21 08:29:59 -05:00
Anna Schumaker
7f6f6395d7 gui: Schedule timeout function from gstreamer code directly 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-21 08:10:59 -05:00
Anna Schumaker
4cae9aaf2b gui: Have collection manager handle keypresses directly 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-21 08:06:10 -05:00
Anna Schumaker
2824ac33eb gui: Start idle callbacks directly from the collection manager 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-21 08:03:48 -05:00
Anna Schumaker
0f61114e15 gui: Remove unused connect_button() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-20 08:48:32 -05:00
Anna Schumaker
f5ed438735 gui: Move the queue TreeModel class into the gui code 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-20 08:46:45 -05:00
Anna Schumaker
98ff0b79cd colmgr: Merge lib/ and gui/ code back together 
The code is still messy now, but I'll be cleaning it up soon!

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-17 13:19:41 -05:00
Anna Schumaker
1935cf9c5e gui: Various playlist cleanups 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-17 11:27:32 -05:00
Anna Schumaker
4bfdb2d0d4 gui: Merge lib/plist.cpp back into gui/plist.cpp 
The lib/ experiment made the gui code a little more complicated than I
was expecting, so I'm going to begin merging everything back into gui/

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-17 10:41:04 -05:00
Anna Schumaker
b4db3ba98f gui: Put exported gst functions in a new namespace 
I intend to put most gui functions in their own namespaces eventually.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-17 10:19:31 -05:00
Anna Schumaker
ea49b374ee gui: Remove gui.cpp 
This file doesn't do anything anymore, so move the init functions into
main.cpp and remove the file.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-15 09:40:17 -05:00
Anna Schumaker
4643a5ff22 gui: Move pause count widgets into gst.cpp 
These values affect audio playback, so they should go with the other
audio widgets.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-15 09:35:33 -05:00
Anna Schumaker
ed88bb08bd gui: Move toggle function to gst code 
This lets me remove the controls.cpp and controls.h files.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-14 19:50:26 -05:00
Anna Schumaker
434b278b61 gui: Move position tracking into gst code 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-14 19:50:25 -05:00
Anna Schumaker
e539a2d208 gui: Move remaining buttons into gstreamer code 
These buttons directly affect audio playback, so let's move them with
the rest of the audio buttons.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-14 19:19:50 -05:00
Anna Schumaker
9d84fdb8b7 lib: Make QueueModel variables private 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-13 20:34:33 -05:00
Anna Schumaker
ad584900fa lib: Clean up QueueModel switch statements 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-13 20:34:33 -05:00
Anna Schumaker
315a169136 lib: Model should use iter_to_id() 
This is cleaner than doing the calculation in several places.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-13 20:34:33 -05:00
Anna Schumaker
06853b4f31 lib: Remove unused QueueModel functions 
These are only needed if implementing a tree, and not a list.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-13 20:34:33 -05:00
Anna Schumaker
6cfd0d5c51 tests: Rework much of the testing library 
I move the code into a new cpp file, so it is no longer a header-only
library.  I also take the chance to add a for-each function for testing
iterators.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-13 09:35:26 -05:00
Anna Schumaker
92d264d4ac audio: Move Driver into audio.h 
I also rename from Driver -> AudioDriver.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 15:48:07 -05:00
Anna Schumaker
acac350879 audio: Remove on_pause_count_changed callback 
The UI should handle this directly on end-of-stream messages.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 15:44:40 -05:00
Anna Schumaker
50147ef070 gui: Handle pause counts from the GSTDriver 
I think it makes sense to handle this directly from the driver, rather
than going through a callback.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 15:27:18 -05:00
Anna Schumaker
6a117c762e driver: play() and pause() shouldn't return a boolean 
This value is never used in the audio layer so let's stop returning it
from the driver.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 14:32:31 -05:00
Anna Schumaker
b633f3fa0c gst: Update the "now playing" fields through the GST driver 
This lets me remove the on_track_loaded() callback function by handling
this event directly.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 12:05:22 -05:00
Anna Schumaker
d7113cb124 driver: Pass Tracks to the load() function 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 12:01:38 -05:00
Anna Schumaker
a4ad0aa79b driver: Fold eos() into the driver 
With this patch I no longer need a Driver :: init() function to handle
picking the next track.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 11:04:14 -05:00
Anna Schumaker
fd2a251c14 audio: Initialize GST from the gui layer 
This means I no longer need to pass argc and argv parameters to core/,
so I can eventually work towards removing the Driver :: init() function.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 10:16:44 -05:00
Anna Schumaker
e7a8ad54bd Audio: Remove the driver on_error() callback function 
This was used to get around layering issues with the gstreamer driver.
Now that the gstreamer implementation is in the gui code we can have it
call audio::next() directly.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-19 17:26:39 -05:00
Anna Schumaker
5b32bb16b4 Audio: Make the TestDriver class completely internal to the audio test 
It's not used anywhere else except during this one test, so move it out
of the global include files.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-19 17:21:32 -05:00
Anna Schumaker
b9d4c6749d audio: Move the get_driver() function into the audio namespace 
It's already in the audio.cpp file, so just reshuffle things a little
bit.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-19 14:54:12 -05:00
Anna Schumaker
1d2b52cc98 driver: Move the GST driver into the gui 
This is a straight copy-and-paste of the header file and the code
implementing it.  I intent to clean this up with future patches.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-19 14:25:59 -05:00
Anna Schumaker
c12dbae73a driver: Track current driver with a pointer 
This will let me implement drivers outside of this file allowing for
easier customization.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-19 14:20:30 -05:00
Anna Schumaker
4a57b170cd audio: Update doxygen documentation 
And remove the Audio section of the DESIGN file.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-19 13:45:55 -05:00
Anna Schumaker
326865f6be driver: Update doxygen documentation 
This lets me remove the Audio Driver section of the DESIGN document.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-19 13:37:44 -05:00
Anna Schumaker
31a405d3c6 deck: Update doxygen documentation 
Also remove the deck section of the DESIGN document.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-12 08:25:53 -05:00
Anna Schumaker
9cbff6e9a1 Playlist: Update doxygen documentation 
I also remove the playlist section of the DESIGN document.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-11 08:23:08 -05:00
Anna Schumaker
7ec7026863 Library: Update doxygen documentation 
Also, remove the library section from the DESIGN document.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-10 08:23:53 -05:00
Anna Schumaker
0758f08642 Queue: Remove _del_at 
I merged it with _del(index) since they are for exactly the same thing.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-09 08:50:03 -05:00
Anna Schumaker
39eb22f05c Queue: Update doxygen documentation 
I also remove the related section of the DESIGN document.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-09 08:40:14 -05:00
Anna Schumaker
6f58813b3c Queue: Clean up doxygen comments for sorting flags 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-07 10:08:21 -05:00
Anna Schumaker
a1b6955a1d Queue: Clean up queue flags 
Reformat the doxygen comments and remove the unused Q_FLAG_MASK
constant.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-07 09:58:47 -05:00