Skip to content

Commit

Permalink
Remove synth index from channel modulation screen
Browse files Browse the repository at this point in the history
  • Loading branch information
@SubhadeepJasu
SubhadeepJasu committed Dec 23, 2021
1 parent 14deea7 commit b69091e
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 31 deletions.
2 changes: 1 addition & 1 deletion src/Core/MidiRecorder/MidiRecorder.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ namespace Ensembles.Core {
if (current_state == RecorderState.STOPPED) {
break;
}
Thread.usleep (66666);
Thread.usleep (100000);
if (current_state == RecorderState.STOPPED) {
break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Shell/Display/CentralDisplay.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ namespace Ensembles.Shell {
voice_menu_r1 = new VoiceMenu (17);
voice_menu_r2 = new VoiceMenu (18);
fx_rack_menu = new EffectRackScreen ();
channel_mod_screen = new ChannelModulatorScreen (0, 0);
channel_mod_screen = new ChannelModulatorScreen (0);
lfo_editor = new LFOEditScreen ();
recorder_screen = new RecorderScreen ();

Expand Down
56 changes: 27 additions & 29 deletions src/Shell/Display/ChannelModulatorScreen.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

namespace Ensembles.Shell {
public class ChannelModulatorScreen : Gtk.Grid {
int _synth_index;
int _channel;

public signal void close_screen ();
Expand Down Expand Up @@ -44,10 +43,9 @@

bool assignable;

public signal void broadcast_assignment (int synth_index, int channel, int modulator);
public signal void broadcast_assignment (int channel, int modulator);

public ChannelModulatorScreen (int synth_index, int channel) {
_synth_index = synth_index;
public ChannelModulatorScreen (int channel) {
_channel = channel;
set_size_request (424, 236);
row_spacing = 8;
Expand Down Expand Up @@ -169,7 +167,7 @@
cut_off_button.get_style_context ().remove_class ("quick-mod-button-locked");
reverb_button.get_style_context ().remove_class ("quick-mod-button-locked");
chorus_button.get_style_context ().remove_class ("quick-mod-button-locked");
if (_synth_index == 1) {
if (_channel < 16) {
if (Ensembles.Core.Synthesizer.get_modulator_lock (1, _channel) == true) {
modulation_button.get_style_context ().add_class ("quick-mod-button-locked");
}
Expand Down Expand Up @@ -235,136 +233,136 @@
modulation_spin_button.value_changed.connect (() => {
if (modulation_lock) {
Ensembles.Core.Synthesizer.set_modulator_value (_channel, 1, (int)modulation_spin_button.value);
if (_synth_index == 1) {
if (_channel < 16) {
modulation_button.get_style_context ().add_class ("quick-mod-button-locked");
}
}
});
pan_spin_button.value_changed.connect (() => {
if (pan_lock) {
Ensembles.Core.Synthesizer.set_modulator_value (_channel, 10, (int)pan_spin_button.value + 64);
if (_synth_index == 1) {
if (_channel < 16) {
pan_button.get_style_context ().add_class ("quick-mod-button-locked");
}
}
});
expression_spin_button.value_changed.connect (() => {
if (expression_lock) {
Ensembles.Core.Synthesizer.set_modulator_value (_channel, 11, (int)expression_spin_button.value);
if (_synth_index == 1) {
if (_channel < 16) {
expression_button.get_style_context ().add_class ("quick-mod-button-locked");
}
}
});
pitch_spin_button.value_changed.connect (() => {
if (pitch_lock) {
Ensembles.Core.Synthesizer.set_modulator_value (_channel, 3, (int)pitch_spin_button.value + 64);
if (_synth_index == 1) {
if (_channel < 16) {
pitch_button.get_style_context ().add_class ("quick-mod-button-locked");
}
}
});
resonance_spin_button.value_changed.connect (() => {
if (resonance_lock) {
Ensembles.Core.Synthesizer.set_modulator_value (_channel, 71, (int)resonance_spin_button.value);
if (_synth_index == 1) {
if (_channel < 16) {
resonance_button.get_style_context ().add_class ("quick-mod-button-locked");
}
}
});
cut_off_spin_button.value_changed.connect (() => {
if (cut_off_lock) {
Ensembles.Core.Synthesizer.set_modulator_value (_channel, 74, (int)cut_off_spin_button.value);
if (_synth_index == 1) {
if (_channel < 16) {
cut_off_button.get_style_context ().add_class ("quick-mod-button-locked");
}
}
});
reverb_spin_button.value_changed.connect (() => {
if (reverb_lock) {
Ensembles.Core.Synthesizer.set_modulator_value (_channel, 91, (int)reverb_spin_button.value);
if (_synth_index == 1) {
if (_channel < 16) {
reverb_button.get_style_context ().add_class ("quick-mod-button-locked");
}
}
});
chorus_spin_button.value_changed.connect (() => {
if (chorus_lock) {
Ensembles.Core.Synthesizer.set_modulator_value (_channel, 93, (int)chorus_spin_button.value);
if (_synth_index == 1) {
if (_channel < 16) {
chorus_button.get_style_context ().add_class ("quick-mod-button-locked");
}
}
});
modulation_button.button_release_event.connect ((event) => {
if (event.button == 3 && _synth_index == 1) {
if (event.button == 3 && _channel < 16) {
Ensembles.Core.Synthesizer.lock_modulator (1, _channel);
modulation_button.get_style_context ().remove_class ("quick-mod-button-locked");
} else if (event.button == 1 && assignable) {
broadcast_assignment (_synth_index, _channel, 1);
broadcast_assignment (_channel, 1);
}
return false;
});
pan_button.button_release_event.connect ((event) => {
if (event.button == 3 && _synth_index == 1) {
if (event.button == 3 && _channel < 16) {
Ensembles.Core.Synthesizer.lock_modulator (10, _channel);
pan_button.get_style_context ().remove_class ("quick-mod-button-locked");
} else if (event.button == 1 && assignable) {
broadcast_assignment (_synth_index, _channel, 10);
broadcast_assignment (_channel, 10);
}
return false;
});
expression_button.button_release_event.connect ((event) => {
if (event.button == 3 && _synth_index == 1) {
if (event.button == 3 && _channel < 16) {
Ensembles.Core.Synthesizer.lock_modulator (11, _channel);
expression_button.get_style_context ().remove_class ("quick-mod-button-locked");
} else if (event.button == 1 && assignable) {
broadcast_assignment (_synth_index, _channel, 11);
broadcast_assignment (_channel, 11);
}
return false;
});
pitch_button.button_release_event.connect ((event) => {
if (event.button == 3 && _synth_index == 1) {
if (event.button == 3 && _channel < 16) {
Ensembles.Core.Synthesizer.lock_modulator (3, _channel);
pitch_button.get_style_context ().remove_class ("quick-mod-button-locked");
} else if (event.button == 1 && assignable) {
broadcast_assignment (_synth_index, _channel, 3);
broadcast_assignment (_channel, 3);
}
return false;
});
resonance_button.button_release_event.connect ((event) => {
if (event.button == 3 && _synth_index == 1) {
if (event.button == 3 && _channel < 16) {
Ensembles.Core.Synthesizer.lock_modulator (71, _channel);
resonance_button.get_style_context ().remove_class ("quick-mod-button-locked");
} else if (event.button == 1 && assignable) {
broadcast_assignment (_synth_index, _channel, 71);
broadcast_assignment (_channel, 71);
}
return false;
});
cut_off_button.button_release_event.connect ((event) => {
if (event.button == 3 && _synth_index == 1) {
if (event.button == 3 && _channel < 16) {
Ensembles.Core.Synthesizer.lock_modulator (74, _channel);
cut_off_button.get_style_context ().remove_class ("quick-mod-button-locked");
} else if (event.button == 1 && assignable) {
broadcast_assignment (_synth_index, _channel, 74);
broadcast_assignment (_channel, 74);
}
return false;
});
reverb_button.button_release_event.connect ((event) => {
if (event.button == 3 && _synth_index == 1) {
if (event.button == 3 && _channel < 16) {
Ensembles.Core.Synthesizer.lock_modulator (91, _channel);
reverb_button.get_style_context ().remove_class ("quick-mod-button-locked");
} else if (event.button == 1 && assignable) {
broadcast_assignment (_synth_index, _channel, 91);
broadcast_assignment (_channel, 91);
}
return false;
});
chorus_button.button_release_event.connect ((event) => {
if (event.button == 3 && _synth_index == 1) {
if (event.button == 3 && _channel < 16) {
Ensembles.Core.Synthesizer.lock_modulator (93, _channel);
chorus_button.get_style_context ().remove_class ("quick-mod-button-locked");
} else if (event.button == 1 && assignable) {
broadcast_assignment (_synth_index, _channel, 93);
broadcast_assignment (_channel, 93);
}
return false;
});
Expand Down

0 comments on commit b69091e

Please sign in to comment.