Skip to content

Commit

Permalink
Bump version to 0.0.15
Browse files Browse the repository at this point in the history
  • Loading branch information
SubhadeepJasu committed Nov 20, 2021
1 parent 6b2261d commit 56d358f
Show file tree
Hide file tree
Showing 18 changed files with 107 additions and 9 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Ensembles is a realtime musical performance arranger app. Its built using Vala a
* Play a one-person band along with a Auto Accompaniment Style from over 100 [WIP] built-in styles based on various genres of music
* Automate your band with Registration Memory
* Record and play audio files using 12 assignable Sampling Pads
* Record your playback in a multitrack recorder (10 tracks)
* Play MIDI files using the inbuilt synthesizer
* Connect to external MIDI keyboard/controller with General MIDI Standard compatibility

Expand Down
12 changes: 10 additions & 2 deletions data/Application.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
border-radius: 50%;
}

.splash-background {
background: #202020;
}

.display-background {
background-color: #000;
}
Expand All @@ -33,7 +37,9 @@
}

.home-screen-panel-top {
background-color: alpha(#007367, 0.75);
background-image: linear-gradient(alpha(#007367, 0.6),alpha(#007367, 0.6)),url("resource://com/github/subhadeepjasu/ensembles/images/display_unit/catalin-sandru-7SxSkCvVM1U-unsplash-blurred.jpg");
background-size: auto 600%;
background-position: 50% 0;
border-bottom: 1px solid alpha(#000, 0.5);
}

Expand All @@ -60,7 +66,9 @@
}

.home-screen-panel-bottom {
background: alpha(#273445, 0.8);
background-image: linear-gradient(alpha(#273445, 0.6),alpha(#273445, 0.6)),url("resource://com/github/subhadeepjasu/ensembles/images/display_unit/catalin-sandru-7SxSkCvVM1U-unsplash-blurred.jpg");
background-size: auto 250%;
background-position: 50% 100%;
border-top: 1px solid alpha(#000, 0.5);
}

Expand Down
Binary file modified data/Images/catalin-sandru-7SxSkCvVM1U-unsplash-blurred.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/Images/catalin-sandru-7SxSkCvVM1U-unsplash.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions data/Images/ensembles_splash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 30 additions & 2 deletions data/com.github.subhadeepjasu.ensembles.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<li>Touch based on-screen assignable joystick</li>
<li>Play a one-person band along with Auto Accompaniment Styles based on various genres of music</li>
<li>Automate your band with Registration Memory and 12 assignable Multipad Variables</li>
<li>Record your playback using a 10-track recorder</li>
<li>Connect to external MIDI keyboard/controller with General MIDI Standard compatibility</li>
</ul>
</description>
Expand All @@ -36,8 +37,25 @@
<launchable type="desktop-id">com.github.subhadeepjasu.ensembles.desktop</launchable>
<screenshots>
<screenshot type="default">
<caption>Instant Playback</caption>
<image>https://raw.githubusercontent.com/SubhadeepJasu/Ensembles/master/screenshots/Screenshot.png</image>
</screenshot>
<screenshot>
<caption>Style Menu</caption>
<image>https://raw.githubusercontent.com/SubhadeepJasu/Ensembles/master/screenshots/ScreenshotStyles.png</image>
</screenshot>
<screenshot>
<caption>Per Channel Modulators</caption>
<image>https://raw.githubusercontent.com/SubhadeepJasu/Ensembles/master/screenshots/ScreenshotChannelModulators.png</image>
</screenshot>
<screenshot>
<caption>Master Knob LFO</caption>
<image>https://raw.githubusercontent.com/SubhadeepJasu/Ensembles/master/screenshots/ScreenshotLFO.png</image>
</screenshot>
<screenshot>
<caption>Multi-track Recorder</caption>
<image>https://raw.githubusercontent.com/SubhadeepJasu/Ensembles/master/screenshots/ScreenshotMultiTrackRecorder.png</image>
</screenshot>
</screenshots>
<content_rating type="oars-1.1">
<content_attribute id="violence-cartoon">none</content_attribute>
Expand Down Expand Up @@ -69,12 +87,22 @@
<content_attribute id="money-gambling">none</content_attribute>
</content_rating>
<releases>
<release version="0.0.15" date="2021-11-05">
<release version="0.0.15" date="2021-11-21">
<description>
<p>New:</p>
<ul>
<li>Make settings UI</li>
<li>Add Rudimentary LV2 Plugin Support</li>
<li>Ability to choose audio driver</li>
<li>Ability to change PC keyboard layout</li>
<li>Add multitrack recorder with upto 10 tracks, (along with recording style events in the first track)</li>
<li>Multi-touch support for on-screen keyboard</li>
<li>Add Rudimentary LV2 Plugin Support (Not yet available in the UI)</li>
</ul>
<p>Fixed:</p>
<ul>
<li>Fix grid and font rendering in HiDPI screens</li>
<li>Make app translatable</li>
<li>More memory bugs swatted</li>
</ul>
</description>
</release>
Expand Down
Binary file modified screenshots/Screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/ScreenshotChannelModulators.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/ScreenshotLFO.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/ScreenshotMultiTrackRecorder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/ScreenshotStyles.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions src/Core/Synthesizer.vala
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,18 @@ namespace Ensembles.Core {
return synthesizer_get_velocity_levels (synth_index, channel);
}

public static int get_transpose () {
return synthesizer_transpose;
}

public static void set_transpose (int transpose) {
synthesizer_transpose = transpose;
}

public static bool get_transpose_active () {
return synthesizer_transpose_enable == 1;
}

public static void set_transpose_active (bool active) {
if (active) {
synthesizer_transpose_enable = 1;
Expand All @@ -165,10 +173,18 @@ namespace Ensembles.Core {
}
}

public static int get_octave () {
return synthesizer_octave;
}

public static void set_octave (int octave) {
synthesizer_octave = octave;
}

public static bool get_octave_shifted () {
return synthesizer_octave_shifted == 1;
}

public static void set_octave_shifted (bool active) {
if (active) {
synthesizer_octave_shifted = 1;
Expand Down
1 change: 0 additions & 1 deletion src/Shell/Common/PcKeyboardHandler.vala
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ namespace Ensembles.Shell {
}

public void handle_keyrelease_event (uint keyval) {
print ("%u\n", keyval);
if (keyval == KeyboardConstants.KeyMap.SHIFT || keyval == KeyboardConstants.KeyMap.SHIFTALT) {
for (int i = 0; i < 60; i++) {
if (key_activated[i]) {
Expand Down
2 changes: 1 addition & 1 deletion src/Shell/Dialogs/Preferences/Preferences.vala
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ namespace Ensembles.Shell.Dialogs.Preferences {
fluidsynth_version.get_style_context ().add_class ("h3");
fluidsynth_version.margin_top = 6;

var version_label = new Gtk.Label ("AW - 100");
var version_label = new Gtk.Label ("AW - 200");
version_label.get_style_context ().add_class ("dim-label");

var web_item = new Dialogs.Preferences.Item ("web-browser", _("Website"));
Expand Down
8 changes: 8 additions & 0 deletions src/Shell/Display/HomeScreen.vala
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,14 @@ namespace Ensembles.Shell {
chord_type_label.queue_draw ();
}

public void update_transpose (int transpose_level) {
transpose_label.set_text (transpose_level.to_string ());
}

public void update_octave (int octave_level) {
octave_shift_label.set_text (octave_level.to_string ());
}

async void update_equalizer () {
Timeout.add (60000 / (tempo * 16), () => {
if (Core.CentralBus.get_style_looping_on ()) {
Expand Down
12 changes: 12 additions & 0 deletions src/Shell/Display/MainDisplayCasing.vala
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ namespace Ensembles.Shell {
main_stack.add_named (recorder_screen, "Sequencer");

splash_screen = new Gtk.Image.from_resource ("/com/github/subhadeepjasu/ensembles/images/display_unit/ensembles_splash.svg");
splash_screen.get_style_context ().add_class ("splash-background");

main_display_leaflet = new Hdy.Leaflet ();
main_display_leaflet.set_mode_transition_duration (400);
Expand Down Expand Up @@ -101,6 +102,9 @@ namespace Ensembles.Shell {
public void queue_remove_splash () {
Timeout.add (2000, () => {
main_overlay.remove (splash_screen);
if (splash_screen != null) {
splash_screen.unref ();
}
return false;
});
}
Expand Down Expand Up @@ -295,5 +299,13 @@ namespace Ensembles.Shell {
}
}
}

public void update_transpose (int transpose) {
home_screen.update_transpose (transpose);
}

public void update_octave (int octave) {
home_screen.update_octave (octave);
}
}
}
24 changes: 24 additions & 0 deletions src/Shell/Views/ControlPanel.vala
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,22 @@ namespace Ensembles.Shell {
transpose_toggle.toggled.connect ((active) => {
Ensembles.Core.Synthesizer.set_transpose_active (active);
EnsemblesApp.settings.set_boolean ("transpose-on", active);

if (active) {
MainWindow.main_display_unit.update_transpose (Core.Synthesizer.get_transpose ());
} else {
MainWindow.main_display_unit.update_transpose (0);
}
});
octave_toggle.toggled.connect ((active) => {
Ensembles.Core.Synthesizer.set_octave_shifted (active);
EnsemblesApp.settings.set_boolean ("octave-shift-on", active);

if (active) {
MainWindow.main_display_unit.update_octave (Core.Synthesizer.get_octave ());
} else {
MainWindow.main_display_unit.update_octave (0);
}
});
reverb_toggle.toggled.connect ((active) => {
reverb_active_change (active);
Expand All @@ -204,12 +216,24 @@ namespace Ensembles.Shell {
int level = (int)(transpose_spin_button.value);
EnsemblesApp.settings.set_int ("transpose-level", level);
Ensembles.Core.Synthesizer.set_transpose (level);

if (Core.Synthesizer.get_transpose_active ()) {
MainWindow.main_display_unit.update_transpose (level);
} else {
MainWindow.main_display_unit.update_transpose (0);
}
}

private void octave_spin_handler () {
int level = (int)(octave_spin_button.value);
EnsemblesApp.settings.set_int ("octave-shift-level", level);
Ensembles.Core.Synthesizer.set_octave (level);

if (Core.Synthesizer.get_octave_shifted ()) {
MainWindow.main_display_unit.update_octave (level);
} else {
MainWindow.main_display_unit.update_octave (0);
}
}

private void chorus_spin_handler () {
Expand Down
4 changes: 3 additions & 1 deletion src/Shell/Views/SongControllerView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* Authored by: Subhadeep Jasu <[email protected]>
Expand Down Expand Up @@ -105,6 +105,8 @@ namespace Ensembles.Shell {
rewind_button.clicked.connect (() => {
rewind ();
});

row_homogeneous = true;
}

public void set_playing (bool playing) {
Expand Down

0 comments on commit 56d358f

Please sign in to comment.