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

250 Commits

Author SHA1 Message Date
Anna Schumaker
ed43fd3689 More utos() cleanups 
I found a few other places where I can use utos() instead of
stringstreams.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-27 14:03:12 -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
e47eb69859 gui: Set a proper application_id 
This silences a warning from gtk.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-26 17:13:09 -05:00
Anna Schumaker
5045e3a8c8 gui: Remove unnecessary #includes 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-22 08:19:45 -05:00
Anna Schumaker
ec83acbdfe gui: Initialization cleanups 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-21 09:08:45 -05:00
Anna Schumaker
8b4d99c50c gui: Rename main.cpp to ocarina.cpp 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-21 08:44:38 -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
c61dca7504 gui: Various collection manager cleanups 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-19 11:43:27 -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
6a5eaa32f8 gui: Preserve "is playing" status when banning tracks 
Just calling audio :: next() will advance to the next song, but won't
change if we're playing music or not.  I think this is what we want to
do when banning tracks.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-16 08:22:01 -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
d299bc464c gui: Move ban and favorite buttons into playlist code 
These buttons directly change the playlists, so let's handle them there.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-15 09:08:02 -05:00
Anna Schumaker
b940fe710c gui: Rearrange playlist tab 
Other files in the gui implement their classes directly, rather than
making extra functions.  Let's do that here, too.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-15 08:33:20 -05:00
Anna Schumaker
300acde068 gui: Set artist, album, title, and duration from gst code 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-14 20:16:28 -05:00
Anna Schumaker
6fec8876a9 gui: Rename position and duration widgets 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-14 19:57:15 -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
694d3f0316 build: Add gstreamer package from gui/Sconscript 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2015-01-02 10:31:14 -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
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
cd8c76e1b2 gst: Move play and pause button handling into gst code 
I can handle these widgets directly from within the gst driver.  I think
this is easier (and more straightforward) than handling this in a
separate file.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 15:02:17 -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
9aaa8649ce gst: More driver cleanups 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 11:49:22 -05:00
Anna Schumaker
3da3c8aeea gst: Move the on_message() function out of the driver 
This function doesn't use anything in the driver class anymore, so it
can be removed.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 11:34:29 -05:00
Anna Schumaker
955129edce gst: Various driver cleanups 
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 11:16:19 -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
882da67480 gst: Begin reworking gst driver 
I removed the need for an overridden constructor and destructor.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-20 10:47:17 -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
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
c7fe5b18d5 tagdb: Rip out most tagdb functions 
Most of this are a straight replacement with the new versions in
tags/track.cpp.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:52 -05:00
Anna Schumaker
cdd20da5c0 Track: Convert length_str into a function 
I don't think this value needs to be stored anywhere in the Track class
since it's fairly easy to calculate.  Let's convert it into a function
for now and reevaluate later!

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00
Anna Schumaker
2540a6aa7a Track: Use GenericTag's _name and _lowercase fields 
This lets me remove the duplicate title and title_lowercase fields from
the Track tag.

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
 2014-12-04 08:31:51 -05:00