58 Commits

Author SHA1 Message Date
rikai
4d352c4df3 Cleanup + Snapcraft build status.
Cleaned up the readme formatting a bit as well as adding the snapcraft status for the automatic building i just enabled. :)
2017-05-19 14:15:33 -07:00
Oscar Cerna-Mandujano
4bf4fe346d Added TouchOSC Layout
Layout for Samsung Galaxy Tab 4 10.1inch. Screen resolution in 1280x800.
2017-05-16 11:48:15 -07:00
Oscar Cerna-Mandujano
079f6f643c Update README.md 2017-05-16 01:21:34 -07:00
Oscar Cerna-Mandujano
d8b6a9b4b8 Update README.md 2017-05-16 01:20:18 -07:00
Oscar Cerna-Mandujano
7185ad900e Merge pull request #31 from maelstrom59/master
Strip images of profiles to avoid libpng warnings
2017-05-14 23:07:24 -07:00
Oscar Cerna-Mandujano
94021bc71c Update README.md 2017-05-14 23:04:43 -07:00
Oscar Cerna
21588f58d2 updated screenshot 2017-05-14 22:44:50 -07:00
Oscar Cerna
0a1cc910b6 Added an sample TouchOSC layout 2017-05-14 22:35:52 -07:00
Oscar Cerna
ee5cd71f60 Open Sound Control and audio ducking have been fully implemented with this commit 2017-05-14 22:31:04 -07:00
Oscar Cerna
851bfcc75e preview unfinished implementation of Open SOund Control implementation 2017-05-13 11:06:33 -07:00
James Fawcus-Robinson
3e63531635 strip images of profiles to avoid libpng warnings
Used ImageMagick's `mogrify -strip` command to strip the images of all
profiles and comments to avoid a libpng warning:
    `libpng warning: iCCP: known incorrect sRGB profile`

This also decreases their size without compromising the quality
2017-05-13 12:53:43 +01:00
Oscar Cerna-Mandujano
df654bcd51 Update README.md 2017-05-10 17:22:51 -07:00
Oscar Cerna-Mandujano
58c70dea4f Update README.md 2017-05-10 17:20:48 -07:00
Oscar Cerna-Mandujano
9a2db847d5 Update README.md 2017-05-10 13:45:09 -07:00
Oscar Cerna
afca3eddde Added back change to pro file INSTALL app in /bin/ 2017-05-10 13:17:51 -07:00
Oscar Cerna
3312dbfee5 Changed Object Serializer to default compiled verion to make satisfying build dependancies easier. 2017-05-10 12:42:41 -07:00
Oscar Cerna-Mandujano
cc55b38ded Create .gitignore 2017-05-10 12:34:00 -07:00
Oscar Cerna
0336528329 Fixed spelling error 2017-05-10 02:47:58 -07:00
Oscar Cerna
643433bd38 Added screenshot to readme 2017-05-10 02:43:57 -07:00
Oscar Cerna-Mandujano
8a1a3660c6 Merge pull request #24 from tsimonq2/snap
[WIP] Add a Snap package
2017-05-10 02:12:11 -07:00
Oscar Cerna
7d62e7c0df Merge remote-tracking branch 'origin/development' 2017-05-10 02:09:41 -07:00
Oscar Cerna
cfe67a2cba Added new project. This commit makes CasterSoundboard feature-complete. 2017-05-10 02:07:00 -07:00
Oscar Cerna
88671df310 Deleting old project 2017-05-10 02:03:43 -07:00
Simon Quigley
530a62da45 Don't add the qt57 part, it breaks things. For now, just install the packages from Ubuntu. 2017-05-09 23:25:59 -05:00
Simon Quigley
1266cddaf9 Get the snap compiling (but not usable yet) 2017-05-09 23:19:44 -05:00
Simon Quigley
ad71942adc Initial Snapcraft file 2017-05-09 22:17:42 -05:00
rikai
52a5b10c46 Merge pull request #19 from MichaelTunnell/master
fixed the build instructions for Debian/Ubuntu
2017-05-09 10:17:13 -07:00
Michael Tunnell
6baa9eac35 fixed the build instructions for Debian/Ubuntu
Changed build-essentials to *build-essential*
Added dependency install for *qtmultimedia5-dev*

tested in Ubuntu 16.04 and the build works now.
2017-05-09 11:12:48 -05:00
Oscar Cerna
5cc9de814e Added toolbar and moved buttons to it 2017-05-05 20:26:58 -07:00
Oscar Cerna-Mandujano
9f6bdd078d made volume sliders more touch friendly 2017-05-05 13:54:50 -07:00
Oscar Cerna-Mandujano
f10dad42d4 QT Editor files updated/created by editor. 2017-05-05 13:47:41 -07:00
Oscar Cerna-Mandujano
6e15646c18 updated git ignore 2017-05-05 13:44:37 -07:00
Oscar Cerna-Mandujano
cab9c408da Rename mainwindow.cpp to MainWindow.cpp 2017-05-05 13:32:59 -07:00
Oscar Cerna-Mandujano
34014288df Added git ignore file 2017-05-05 13:30:09 -07:00
Oscar Cerna-Mandujano
0b895ccab5 Merge pull request #15 from maelstrom59/patch-1
readme: fix Fedora installation instructions
2017-05-05 12:19:52 -07:00
James F-Robinson
22d81c8df9 readme: fix Fedora installation instructions
Had to change a few commands to get it to build on my Fedora 25 machine:
* changed the 'qt-devel' package for 'qt5-devel'
* changed the 'qmake' command to 'qmake-qt5'
2017-05-05 13:24:05 +01:00
rikai
d12949da78 Merge pull request #14 from JupiterBroadcasting/development
Merge the updated README into master.
2017-05-04 14:31:28 -07:00
rikai
901481b766 Update README.md
Not much of a reason for this, really. People can check their branches and makes merging into master annoying.
2017-05-04 14:29:56 -07:00
rikai
f286cf0908 Merge pull request #12 from chasinglogic/install-instructions
Add installation instructions, closes #11
2017-05-04 08:48:09 -07:00
Mathew Robinson
809a4230f3 add installation instructions 2017-05-04 11:23:27 -04:00
rikai
347124c9e7 Merge pull request #10 from aszlig/refactor
Cleanup, refactor and implement save/restore
2017-05-03 20:45:55 -07:00
Ryan Moeller
b3e58bddcc
Add .gitignore 2017-05-03 12:14:42 +02:00
aszlig
d1711e7789
CasterBoard: Refactor further + make more readable
The pull request made by @freqlabs is much more readable, because it
also gets rid of the hardcoded grid coordinates.

So this is mainly a rebase of his commit 04f5d1d92c3cc8b2d0312961b4d589
in #9 on top of my changes:

    Use a QMap to simplify CasterBoard

    Instead of using separate member variables for every player, a
    single map can both store the players and provide a convenient
    mechanism for mapping key press events to the appropriate player.

    The map uses a Qt::Key symbol as the key and stores the pointer to
    each widget as the value.

    To populate the map, we iterate over each character in a string,
    where the characters correspond to the labels of the hotkey widgets.
    The corresponding Qt::Key values are stored in another array that is
    accessed in parallel. A counter keeps track of the offset in the
    keys array and is also used to calculate the grid position of each
    widget.

Instead of a map I'm still using a QHash, because it doesn't allow for
duplicates and is also faster in lookup.

I've also noticed that he's been using C++11 constructs, so I'm also
using these for saveLayout() and restoreLayout() as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @freqlabs
2017-05-03 12:10:03 +02:00
aszlig
d48cfbf72d
Save and restore layout on exit/startup
We already have a map of all the keys and their corresponding
CasterBoardLayout values, which link to the corresponding widget.

So when closing the window, the layout is saved using QSettings within
the [boards] section in an array mapping from the key id to the file
name, which looks like this:

[boards]
1\49=/path/to/foo.ogg
1\title=aaa
2\69=/path/to/bar.flac
2\title=bbb
size=2

Of course, if we have more complex layouts which doesn't involve a grid,
this will fall short, but we can still implement this once that's the
case.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #3
2017-05-03 11:31:14 +02:00
aszlig
8156d69784
Move CasterBoardLayout class into its own file
We're going to extend that class, so let's give it its own file.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-05-03 11:31:11 +02:00
aszlig
a9a9264eea
board: Refactor to use a single hash for layout
Having all the keys copy & pasted all over the place is a lot of churn
and doesn't need to be like that.

We're heading on to saving the state of the board layout and duplicating
even more of these lines all over the place is not magically cleaning up
the code.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-05-03 11:31:08 +02:00
aszlig
f4e59f85a8
default.nix: Add all gstreamer plugins
This was the reason audio wasn't working for me so far.

In the long term however I think it would be a good idea to actually
show an error dialogue with detailed information if that happens.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-05-03 11:31:03 +02:00
aszlig
0c9fdcbc9b
player: Allow to select a file instead of dragging
This is mainly useful because I'm using a tiling WM and don't have a lot
of applications available (well, except Chromium, but that's still very
much annoying while testing) for dragging and dropping files into
CasterSoundboard.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-05-03 11:31:00 +02:00
aszlig
78a95c8bfe
player: Factor out state into a single State enum
This not only gives a bit more information about what's going on within
a specific player tile, but we now have a single state property which we
can use to boil down all the various states of the subwidgets to the
CasterPlayer class.

Right now we do not yet take into account the QMediaPlayer's state, but
that's something for future improvements.

So the result is now that the user now should no longer be in the dark
if Qt Multimedia fails to load a file.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-05-03 11:30:58 +02:00
aszlig
79f3e94131
player: Give a visual cue about loading state
If the player doesn't work correctly (which currently is the case on my
system) or can't load the file immediately (like for example from a
network resource) it's a good idea to actually show in the tile that
it's still trying to load the source.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2017-05-03 11:30:55 +02:00