Anna Schumaker
bc5e53a423
gui: Store pointers to play and pause buttons
...
We use these every half-second, so let's not waste time looking them up
every call.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:28:23 -04:00
Anna Schumaker
a2987c2952
gui: Call on_track_loaded() during startup
...
Also move the controls_init() function to be with other init()
functions.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:23:23 -04:00
Anna Schumaker
8152327f65
gui: Move o_seek() into controls.cpp
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:16:36 -04:00
Anna Schumaker
5e7a25e007
gui: Store position and progress widgets
...
Now we don't need to keep looking them up, and the code looks a little
bit cleaner =)
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:09:57 -04:00
Anna Schumaker
62cdc4c909
gui: Move remaning window setup into window.cpp
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:03:57 -04:00
Anna Schumaker
acdeb785f5
gui: Move window keypress handling to window.cpp
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:01:08 -04:00
Anna Schumaker
253898e9b5
gui: Set tab size and runtime on startup
...
This used to happen by itself, but changing the order of how tabs are
initialized broke this.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:01:08 -04:00
Anna Schumaker
9b98788106
gui: Begin breaking out window code
...
I think this will help with maintainability. We'll see ...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:01:08 -04:00
Anna Schumaker
5c2bd9231d
core: Remove on_play() callback
...
It has no users anymore.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:01:08 -04:00
Anna Schumaker
df0d1496de
lib: Create a schedule() function
...
This lets me clean up some of the code in controls.cpp
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:01:07 -04:00
Anna Schumaker
1c437c4957
gui: Move init() steps into controls.cpp
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:01:07 -04:00
Anna Schumaker
922830a2ab
gui: Move o_next() into the controls.cpp file
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-11 08:01:06 -04:00
Anna Schumaker
78624a6d98
gui: Fix up how the gui pauses
...
I make it look more like o_play().
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-09 08:28:18 -04:00
Anna Schumaker
1a6b6d9c54
audio: Remove the on_play() callback
...
There are no more users of this function.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-08 17:26:21 -04:00
Anna Schumaker
d68d5f2b40
gui: Create o_play() for handling the play function
...
This calls the audio :: play() function, rather than having the button
call into the audio layer directly. With this patch, the on_play()
callback is unused.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-09-08 17:21:40 -04:00
Anna Schumaker
c9cabb78f1
colmgr: Make sure banned tracks are removed when reenabling a library
...
This issue was solved in Ocarina 6.1.3, but I didn't add a unit test for
it. This patch adds a test.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-08-19 08:57:36 -04:00
Anna Schumaker
412dc67e1f
Merge branch 'master' into Ocarina-next
...
Conflicts:
Sconstruct
gui/collection_mgr.cpp
2014-08-19 08:08:55 -04:00
Anna Schumaker
345ad705ce
PKGBUILD: Updates for 6.1.3
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-08-17 17:21:08 -04:00
Anna Schumaker
654bb99c6d
Ocarina 6.1.3
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-08-17 17:18:45 -04:00
Anna Schumaker
41506f3177
gui: Remove banned songs from Collection when re-enabling
...
I wasn't doing this before, so banned songs were showing up in the
collection list again. I think this is kind of an ugly fix, though.
Perhaps there is a better way to do it?
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-08-17 17:17:29 -04:00
Anna Schumaker
cfa61fa816
gui: Play next song after banning
...
If the user tells us they don't like the current song then we shouldn't
keep playing it!
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-08-17 17:01:52 -04:00
Anna Schumaker
d185b29d7b
PKGBUILD: 6.1.2 Update
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-08-17 17:01:10 -04:00
Anna Schumaker
76a5e0b6ba
Ocarina 6.1.2
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-08-12 10:40:52 -04:00
Anna Schumaker
8fd5d8173e
filter: Clear the result set before filtering
...
Ocarina was preserving the results set even if there were 0 search
results for the entire search string. So a search for "walllllll" would
still return results for "wall".
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-08-12 10:23:33 -04:00
Anna Schumaker
be72339b2d
filter: Check for empty results when filtering
...
The user could search for a term that isn't stored in the filter index.
This is represented through a NULL pointer returned from the
Index.find() function. Let's check this pointer before attempting to
dereference it ...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-08-12 09:59:00 -04:00
Anna Schumaker
2890819cd3
playlist tab cleanups
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-07-27 11:52:36 -04:00
Anna Schumaker
160d2ac3be
plist: Move more playlist functions into lib/
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-07-27 11:41:40 -04:00
Anna Schumaker
97a8646977
plist: Move liststore into lib/
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-07-27 11:25:12 -04:00
Anna Schumaker
32bb1c670b
model: Create a basic unit test
...
This test doesn't catch everything, but I want to move on anyway!
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-29 11:40:15 -04:00
Anna Schumaker
09af8d81d2
model: Move the custom TreeModel from gui/ to lib/
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-29 10:48:23 -04:00
Anna Schumaker
b516afe832
core: Create a single init() function
...
Initialize everything from the core/ layer, that way lib/ doesn't need
to know the correct order.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-29 10:36:55 -04:00
Anna Schumaker
77616aa8d2
Merge branch 'master' into Ocarina-next
...
Conflicts:
Sconstruct
tests/Sconscript
2014-06-26 17:04:58 -04:00
Anna Schumaker
b9c3d9684c
PKGBUILD: 6.1.1 update
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-26 16:55:49 -04:00
Anna Schumaker
c93b3f832f
Ocarina 6.1.1
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-26 16:49:04 -04:00
Anna Schumaker
9d8455001f
gen_library.sh: Only copy .ogg files
...
This excludes the invalid_track file I just added.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-22 12:59:28 -04:00
Anna Schumaker
e274d6399b
tags: Fix when library->count is modified
...
Whenever a Track is destructed, library->count is decremented. This
means that even if tagging fails we need to increment library->count to
keep this value consistent.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-22 12:59:27 -04:00
Anna Schumaker
a74eaaffa6
tags: Check that a Track was tagged correctly
...
Without this check we could end up creating a Track for a .ini file or
some other non-audio file.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-22 12:35:08 -04:00
Anna Schumaker
d74d1ea634
Prepare for a bugfix release
...
Looks like I'll need to release a 6.1.1 soon
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-22 12:35:08 -04:00
Anna Schumaker
76f0b7b55f
lib: Move keyval parsing into lib/
...
I'll eventually add in checks for keypad vs top row number keys.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-22 11:42:01 -04:00
Anna Schumaker
80bed8b956
collection manager: Rename widgets in the glade file
...
o_collection_* was easily confused with widgets on the collection tab,
so I renamed everything to be less confusing.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-22 11:19:05 -04:00
Anna Schumaker
dd9f6de62f
colmgr: Don't list NULL libraries
...
This leads to a segmentation fault...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-22 11:14:54 -04:00
Anna Schumaker
8c7b1a9a27
ocarina6.glade: Polish the collection manager tab
...
- Adjust spacing of the FileChooser
- Rename button from OK -> Add
- Add tooltips to the buttons
- Rename column from Path -> Collection
- Filter out files that aren't directories
2014-06-22 11:03:37 -04:00
Anna Schumaker
fdb31916a6
gui: Change chooser directory when selected path is changed
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-22 10:41:46 -04:00
Anna Schumaker
2094227f91
collection_mgr: Rename functions
...
Since these are all static functions, I don't need the _collection
part.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-22 10:22:05 -04:00
Anna Schumaker
3d067878f2
colmgr: Add a function for updating a specific path
...
On the gui end, call this function when a row in the "collected paths"
list is double-clicked.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-22 10:14:23 -04:00
Anna Schumaker
42ec504b90
gui: Collection manager cleanups
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-21 12:44:22 -04:00
Anna Schumaker
a5f47e46a8
colmgr: Move some collection manager code into lib/
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-21 12:27:34 -04:00
Anna Schumaker
9ea0fd4f29
core: Update include file #ifndef guards
...
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-21 09:49:07 -04:00
Anna Schumaker
194a09bed4
lib: Initialize the GtkBuilder from the middle layer
...
This will provide an interface for accessing widgets, and make it easier
to swap out different builder files.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-15 11:31:04 -04:00
Anna Schumaker
4ed36c79df
lib: Add support for looking up files from share/ocarina/
...
I replace the /proc/self/exe method with a simple hard-coded string.
This means that binaries run from the source directory need to be run
from the root of the source directory.
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
2014-06-15 10:12:55 -04:00