diff --git a/README.md b/README.md index 661b13121..9c65c4be7 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Features Building --------- -See [Compiling LMMS](https://github.com/LMMS/lmms/wiki/Compiling-lmms) on our +See [Compiling LMMS](https://github.com/LMMS/lmms/wiki/Compiling) on our wiki for information on how to build LMMS. diff --git a/data/themes/default/add.png b/data/themes/default/add.png old mode 100755 new mode 100644 diff --git a/data/themes/default/add_automation.png b/data/themes/default/add_automation.png old mode 100755 new mode 100644 diff --git a/data/themes/default/add_bb_track.png b/data/themes/default/add_bb_track.png old mode 100755 new mode 100644 diff --git a/data/themes/default/add_folder.png b/data/themes/default/add_folder.png old mode 100755 new mode 100644 diff --git a/data/themes/default/add_sample_track.png b/data/themes/default/add_sample_track.png old mode 100755 new mode 100644 diff --git a/data/themes/default/analysis.png b/data/themes/default/analysis.png old mode 100755 new mode 100644 diff --git a/data/themes/default/apply-selected.png b/data/themes/default/apply-selected.png old mode 100755 new mode 100644 diff --git a/data/themes/default/apply.png b/data/themes/default/apply.png old mode 100755 new mode 100644 diff --git a/data/themes/default/arp_down.png b/data/themes/default/arp_down.png old mode 100755 new mode 100644 diff --git a/data/themes/default/arp_free.png b/data/themes/default/arp_free.png old mode 100755 new mode 100644 diff --git a/data/themes/default/arp_random.png b/data/themes/default/arp_random.png old mode 100755 new mode 100644 diff --git a/data/themes/default/arp_sort.png b/data/themes/default/arp_sort.png old mode 100755 new mode 100644 diff --git a/data/themes/default/arp_sync.png b/data/themes/default/arp_sync.png old mode 100755 new mode 100644 diff --git a/data/themes/default/arp_up.png b/data/themes/default/arp_up.png old mode 100755 new mode 100644 diff --git a/data/themes/default/arp_up_and_down.png b/data/themes/default/arp_up_and_down.png old mode 100755 new mode 100644 diff --git a/data/themes/default/automation.png b/data/themes/default/automation.png old mode 100755 new mode 100644 diff --git a/data/themes/default/automation_track.png b/data/themes/default/automation_track.png old mode 100755 new mode 100644 diff --git a/data/themes/default/autoscroll_off.png b/data/themes/default/autoscroll_off.png old mode 100755 new mode 100644 diff --git a/data/themes/default/autoscroll_on.png b/data/themes/default/autoscroll_on.png old mode 100755 new mode 100644 diff --git a/data/themes/default/back_to_start.png b/data/themes/default/back_to_start.png old mode 100755 new mode 100644 diff --git a/data/themes/default/back_to_zero.png b/data/themes/default/back_to_zero.png old mode 100755 new mode 100644 diff --git a/data/themes/default/bb_track.png b/data/themes/default/bb_track.png old mode 100755 new mode 100644 diff --git a/data/themes/default/bb_track_btn.png b/data/themes/default/bb_track_btn.png old mode 100755 new mode 100644 diff --git a/data/themes/default/black_key.png b/data/themes/default/black_key.png old mode 100755 new mode 100644 diff --git a/data/themes/default/black_key_pressed.png b/data/themes/default/black_key_pressed.png old mode 100755 new mode 100644 diff --git a/data/themes/default/cancel.png b/data/themes/default/cancel.png old mode 100755 new mode 100644 diff --git a/data/themes/default/chord.png b/data/themes/default/chord.png old mode 100755 new mode 100644 diff --git a/data/themes/default/clock.png b/data/themes/default/clock.png old mode 100755 new mode 100644 diff --git a/data/themes/default/colorize.png b/data/themes/default/colorize.png old mode 100755 new mode 100644 diff --git a/data/themes/default/combobox_arrow.png b/data/themes/default/combobox_arrow.png old mode 100755 new mode 100644 diff --git a/data/themes/default/combobox_arrow_selected.png b/data/themes/default/combobox_arrow_selected.png old mode 100755 new mode 100644 diff --git a/data/themes/default/combobox_bg.png b/data/themes/default/combobox_bg.png old mode 100755 new mode 100644 diff --git a/data/themes/default/computer.png b/data/themes/default/computer.png old mode 100755 new mode 100644 diff --git a/data/themes/default/controller.png b/data/themes/default/controller.png old mode 100755 new mode 100644 diff --git a/data/themes/default/cpuload_bg.png b/data/themes/default/cpuload_bg.png old mode 100755 new mode 100644 diff --git a/data/themes/default/cpuload_leds.png b/data/themes/default/cpuload_leds.png old mode 100755 new mode 100644 diff --git a/data/themes/default/dont_know.png b/data/themes/default/dont_know.png old mode 100755 new mode 100644 diff --git a/data/themes/default/edit_copy.png b/data/themes/default/edit_copy.png old mode 100755 new mode 100644 diff --git a/data/themes/default/edit_cut.png b/data/themes/default/edit_cut.png old mode 100755 new mode 100644 diff --git a/data/themes/default/edit_draw.png b/data/themes/default/edit_draw.png old mode 100755 new mode 100644 diff --git a/data/themes/default/edit_erase.png b/data/themes/default/edit_erase.png old mode 100755 new mode 100644 diff --git a/data/themes/default/edit_move.png b/data/themes/default/edit_move.png old mode 100755 new mode 100644 diff --git a/data/themes/default/edit_paste.png b/data/themes/default/edit_paste.png old mode 100755 new mode 100644 diff --git a/data/themes/default/edit_redo.png b/data/themes/default/edit_redo.png old mode 100755 new mode 100644 diff --git a/data/themes/default/edit_rename.png b/data/themes/default/edit_rename.png old mode 100755 new mode 100644 diff --git a/data/themes/default/edit_select.png b/data/themes/default/edit_select.png old mode 100755 new mode 100644 diff --git a/data/themes/default/edit_undo.png b/data/themes/default/edit_undo.png old mode 100755 new mode 100644 diff --git a/data/themes/default/effect_plugin.png b/data/themes/default/effect_plugin.png old mode 100755 new mode 100644 diff --git a/data/themes/default/error.png b/data/themes/default/error.png old mode 100755 new mode 100644 diff --git a/data/themes/default/exit.png b/data/themes/default/exit.png old mode 100755 new mode 100644 diff --git a/data/themes/default/exp_wave_active.png b/data/themes/default/exp_wave_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/exp_wave_inactive.png b/data/themes/default/exp_wave_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/factory_files.png b/data/themes/default/factory_files.png old mode 100755 new mode 100644 diff --git a/data/themes/default/fader_background.png b/data/themes/default/fader_background.png old mode 100755 new mode 100644 diff --git a/data/themes/default/fader_knob.png b/data/themes/default/fader_knob.png old mode 100755 new mode 100644 diff --git a/data/themes/default/fader_leds.png b/data/themes/default/fader_leds.png old mode 100755 new mode 100644 diff --git a/data/themes/default/file.png b/data/themes/default/file.png old mode 100755 new mode 100644 diff --git a/data/themes/default/filter_2lp.png b/data/themes/default/filter_2lp.png old mode 100755 new mode 100644 diff --git a/data/themes/default/filter_ap.png b/data/themes/default/filter_ap.png old mode 100755 new mode 100644 diff --git a/data/themes/default/filter_bp.png b/data/themes/default/filter_bp.png old mode 100755 new mode 100644 diff --git a/data/themes/default/filter_hp.png b/data/themes/default/filter_hp.png old mode 100755 new mode 100644 diff --git a/data/themes/default/filter_lp.png b/data/themes/default/filter_lp.png old mode 100755 new mode 100644 diff --git a/data/themes/default/filter_notch.png b/data/themes/default/filter_notch.png old mode 100755 new mode 100644 diff --git a/data/themes/default/flip_x.png b/data/themes/default/flip_x.png old mode 100755 new mode 100644 diff --git a/data/themes/default/flip_y.png b/data/themes/default/flip_y.png old mode 100755 new mode 100644 diff --git a/data/themes/default/folder.png b/data/themes/default/folder.png old mode 100755 new mode 100644 diff --git a/data/themes/default/folder_locked.png b/data/themes/default/folder_locked.png old mode 100755 new mode 100644 diff --git a/data/themes/default/folder_opened.png b/data/themes/default/folder_opened.png old mode 100755 new mode 100644 diff --git a/data/themes/default/fx_mixer.png b/data/themes/default/fx_mixer.png old mode 100755 new mode 100644 diff --git a/data/themes/default/hand.png b/data/themes/default/hand.png old mode 100755 new mode 100644 diff --git a/data/themes/default/help.png b/data/themes/default/help.png old mode 100755 new mode 100644 diff --git a/data/themes/default/hint.png b/data/themes/default/hint.png old mode 100755 new mode 100644 diff --git a/data/themes/default/home.png b/data/themes/default/home.png old mode 100755 new mode 100644 diff --git a/data/themes/default/hq_mode.png b/data/themes/default/hq_mode.png old mode 100755 new mode 100644 diff --git a/data/themes/default/instrument_track.png b/data/themes/default/instrument_track.png old mode 100755 new mode 100644 diff --git a/data/themes/default/keep_stop_position.png b/data/themes/default/keep_stop_position.png old mode 100755 new mode 100644 diff --git a/data/themes/default/knob01.png b/data/themes/default/knob01.png old mode 100755 new mode 100644 diff --git a/data/themes/default/knob02.png b/data/themes/default/knob02.png old mode 100755 new mode 100644 diff --git a/data/themes/default/knob03.png b/data/themes/default/knob03.png old mode 100755 new mode 100644 diff --git a/data/themes/default/knob05.png b/data/themes/default/knob05.png old mode 100755 new mode 100644 diff --git a/data/themes/default/lcd_19green.png b/data/themes/default/lcd_19green.png old mode 100755 new mode 100644 diff --git a/data/themes/default/lcd_19red.png b/data/themes/default/lcd_19red.png old mode 100755 new mode 100644 diff --git a/data/themes/default/lcd_21pink.png b/data/themes/default/lcd_21pink.png old mode 100755 new mode 100644 diff --git a/data/themes/default/led_blue.png b/data/themes/default/led_blue.png old mode 100755 new mode 100644 diff --git a/data/themes/default/led_green.png b/data/themes/default/led_green.png old mode 100755 new mode 100644 diff --git a/data/themes/default/led_off.png b/data/themes/default/led_off.png old mode 100755 new mode 100644 diff --git a/data/themes/default/led_red.png b/data/themes/default/led_red.png old mode 100755 new mode 100644 diff --git a/data/themes/default/led_yellow.png b/data/themes/default/led_yellow.png old mode 100755 new mode 100644 diff --git a/data/themes/default/lfo_d100_active.png b/data/themes/default/lfo_d100_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/lfo_d100_inactive.png b/data/themes/default/lfo_d100_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/lfo_x100_active.png b/data/themes/default/lfo_x100_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/lfo_x100_inactive.png b/data/themes/default/lfo_x100_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/lfo_x1_active.png b/data/themes/default/lfo_x1_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/lfo_x1_inactive.png b/data/themes/default/lfo_x1_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/loop_point.png b/data/themes/default/loop_point.png old mode 100755 new mode 100644 diff --git a/data/themes/default/loop_points_off.png b/data/themes/default/loop_points_off.png old mode 100755 new mode 100644 diff --git a/data/themes/default/loop_points_on.png b/data/themes/default/loop_points_on.png old mode 100755 new mode 100644 diff --git a/data/themes/default/main_slider.png b/data/themes/default/main_slider.png old mode 100755 new mode 100644 diff --git a/data/themes/default/master_pitch.png b/data/themes/default/master_pitch.png old mode 100755 new mode 100644 diff --git a/data/themes/default/master_volume.png b/data/themes/default/master_volume.png old mode 100755 new mode 100644 diff --git a/data/themes/default/metronome.png b/data/themes/default/metronome.png old mode 100755 new mode 100644 diff --git a/data/themes/default/midi_file.png b/data/themes/default/midi_file.png old mode 100755 new mode 100644 diff --git a/data/themes/default/mixer_send_off.png b/data/themes/default/mixer_send_off.png old mode 100755 new mode 100644 diff --git a/data/themes/default/mixer_send_on.png b/data/themes/default/mixer_send_on.png old mode 100755 new mode 100644 diff --git a/data/themes/default/moog_saw_wave_active.png b/data/themes/default/moog_saw_wave_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/moog_saw_wave_inactive.png b/data/themes/default/moog_saw_wave_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/muted.png b/data/themes/default/muted.png old mode 100755 new mode 100644 diff --git a/data/themes/default/new_channel.png b/data/themes/default/new_channel.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note.png b/data/themes/default/note.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_double_whole.png b/data/themes/default/note_double_whole.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_eight.png b/data/themes/default/note_eight.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_eighth.png b/data/themes/default/note_eighth.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_half.png b/data/themes/default/note_half.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_none.png b/data/themes/default/note_none.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_quarter.png b/data/themes/default/note_quarter.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_sixteenth.png b/data/themes/default/note_sixteenth.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_thirtysecond.png b/data/themes/default/note_thirtysecond.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_tripleteighth.png b/data/themes/default/note_tripleteighth.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_triplethalf.png b/data/themes/default/note_triplethalf.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_tripletquarter.png b/data/themes/default/note_tripletquarter.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_tripletsixteenth.png b/data/themes/default/note_tripletsixteenth.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_tripletthirtysecond.png b/data/themes/default/note_tripletthirtysecond.png old mode 100755 new mode 100644 diff --git a/data/themes/default/note_whole.png b/data/themes/default/note_whole.png old mode 100755 new mode 100644 diff --git a/data/themes/default/pat_rec.png b/data/themes/default/pat_rec.png old mode 100755 new mode 100644 diff --git a/data/themes/default/pause.png b/data/themes/default/pause.png old mode 100755 new mode 100644 diff --git a/data/themes/default/piano.png b/data/themes/default/piano.png old mode 100755 new mode 100644 diff --git a/data/themes/default/play.png b/data/themes/default/play.png old mode 100755 new mode 100644 diff --git a/data/themes/default/playpos_marker.png b/data/themes/default/playpos_marker.png old mode 100755 new mode 100644 diff --git a/data/themes/default/plugins.png b/data/themes/default/plugins.png old mode 100755 new mode 100644 diff --git a/data/themes/default/ports.png b/data/themes/default/ports.png old mode 100755 new mode 100644 diff --git a/data/themes/default/pr_black_key.png b/data/themes/default/pr_black_key.png old mode 100755 new mode 100644 diff --git a/data/themes/default/pr_black_key_pressed.png b/data/themes/default/pr_black_key_pressed.png old mode 100755 new mode 100644 diff --git a/data/themes/default/pr_white_key_big.png b/data/themes/default/pr_white_key_big.png old mode 100755 new mode 100644 diff --git a/data/themes/default/pr_white_key_big_pressed.png b/data/themes/default/pr_white_key_big_pressed.png old mode 100755 new mode 100644 diff --git a/data/themes/default/pr_white_key_small.png b/data/themes/default/pr_white_key_small.png old mode 100755 new mode 100644 diff --git a/data/themes/default/pr_white_key_small_pressed.png b/data/themes/default/pr_white_key_small_pressed.png old mode 100755 new mode 100644 diff --git a/data/themes/default/preset_file.png b/data/themes/default/preset_file.png old mode 100755 new mode 100644 diff --git a/data/themes/default/progression_cubic_hermite.png b/data/themes/default/progression_cubic_hermite.png old mode 100755 new mode 100644 diff --git a/data/themes/default/progression_discrete.png b/data/themes/default/progression_discrete.png old mode 100755 new mode 100644 diff --git a/data/themes/default/progression_linear.png b/data/themes/default/progression_linear.png old mode 100755 new mode 100644 diff --git a/data/themes/default/project_export.png b/data/themes/default/project_export.png old mode 100755 new mode 100644 diff --git a/data/themes/default/project_file.png b/data/themes/default/project_file.png old mode 100755 new mode 100644 diff --git a/data/themes/default/project_import.png b/data/themes/default/project_import.png old mode 100755 new mode 100644 diff --git a/data/themes/default/project_new.png b/data/themes/default/project_new.png old mode 100755 new mode 100644 diff --git a/data/themes/default/project_new_from_template.png b/data/themes/default/project_new_from_template.png old mode 100755 new mode 100644 diff --git a/data/themes/default/project_notes.png b/data/themes/default/project_notes.png old mode 100755 new mode 100644 diff --git a/data/themes/default/project_open.png b/data/themes/default/project_open.png old mode 100755 new mode 100644 diff --git a/data/themes/default/project_open_recent.png b/data/themes/default/project_open_recent.png old mode 100755 new mode 100644 diff --git a/data/themes/default/project_save.png b/data/themes/default/project_save.png old mode 100755 new mode 100644 diff --git a/data/themes/default/project_saveas.png b/data/themes/default/project_saveas.png old mode 100755 new mode 100644 diff --git a/data/themes/default/quantize.png b/data/themes/default/quantize.png old mode 100755 new mode 100644 diff --git a/data/themes/default/random_wave_active.png b/data/themes/default/random_wave_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/random_wave_inactive.png b/data/themes/default/random_wave_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/receive_bg_arrow.png b/data/themes/default/receive_bg_arrow.png old mode 100755 new mode 100644 diff --git a/data/themes/default/record.png b/data/themes/default/record.png old mode 100755 new mode 100644 diff --git a/data/themes/default/record_accompany.png b/data/themes/default/record_accompany.png old mode 100755 new mode 100644 diff --git a/data/themes/default/recover.png b/data/themes/default/recover.png old mode 100755 new mode 100644 diff --git a/data/themes/default/reload.png b/data/themes/default/reload.png old mode 100755 new mode 100644 diff --git a/data/themes/default/round_square_wave_active.png b/data/themes/default/round_square_wave_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/round_square_wave_inactive.png b/data/themes/default/round_square_wave_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sample_file.png b/data/themes/default/sample_file.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sample_track.png b/data/themes/default/sample_track.png old mode 100755 new mode 100644 diff --git a/data/themes/default/saw_wave_active.png b/data/themes/default/saw_wave_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/saw_wave_inactive.png b/data/themes/default/saw_wave_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sbarrow_down.png b/data/themes/default/sbarrow_down.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sbarrow_down_d.png b/data/themes/default/sbarrow_down_d.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sbarrow_left.png b/data/themes/default/sbarrow_left.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sbarrow_left_d.png b/data/themes/default/sbarrow_left_d.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sbarrow_right.png b/data/themes/default/sbarrow_right.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sbarrow_right_d.png b/data/themes/default/sbarrow_right_d.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sbarrow_up.png b/data/themes/default/sbarrow_up.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sbarrow_up_d.png b/data/themes/default/sbarrow_up_d.png old mode 100755 new mode 100644 diff --git a/data/themes/default/scale.png b/data/themes/default/scale.png old mode 100755 new mode 100644 diff --git a/data/themes/default/send_bg_arrow.png b/data/themes/default/send_bg_arrow.png old mode 100755 new mode 100644 diff --git a/data/themes/default/setup_audio.png b/data/themes/default/setup_audio.png old mode 100755 new mode 100644 diff --git a/data/themes/default/setup_directories.png b/data/themes/default/setup_directories.png old mode 100755 new mode 100644 diff --git a/data/themes/default/setup_general.png b/data/themes/default/setup_general.png old mode 100755 new mode 100644 diff --git a/data/themes/default/setup_midi.png b/data/themes/default/setup_midi.png old mode 100755 new mode 100644 diff --git a/data/themes/default/setup_performance.png b/data/themes/default/setup_performance.png old mode 100755 new mode 100644 diff --git a/data/themes/default/shadow_c.png b/data/themes/default/shadow_c.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sin_wave_active.png b/data/themes/default/sin_wave_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/sin_wave_inactive.png b/data/themes/default/sin_wave_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/songeditor.png b/data/themes/default/songeditor.png old mode 100755 new mode 100644 diff --git a/data/themes/default/soundfont_file.png b/data/themes/default/soundfont_file.png old mode 100755 new mode 100644 diff --git a/data/themes/default/splash.png b/data/themes/default/splash.png old mode 100755 new mode 100644 diff --git a/data/themes/default/square_wave_active.png b/data/themes/default/square_wave_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/square_wave_inactive.png b/data/themes/default/square_wave_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/step_btn_add.png b/data/themes/default/step_btn_add.png old mode 100755 new mode 100644 diff --git a/data/themes/default/step_btn_duplicate.png b/data/themes/default/step_btn_duplicate.png old mode 100755 new mode 100644 diff --git a/data/themes/default/step_btn_off.png b/data/themes/default/step_btn_off.png old mode 100755 new mode 100644 diff --git a/data/themes/default/step_btn_off_light.png b/data/themes/default/step_btn_off_light.png old mode 100755 new mode 100644 diff --git a/data/themes/default/step_btn_remove.png b/data/themes/default/step_btn_remove.png old mode 100755 new mode 100644 diff --git a/data/themes/default/stepper-down-press.png b/data/themes/default/stepper-down-press.png old mode 100755 new mode 100644 diff --git a/data/themes/default/stepper-down.png b/data/themes/default/stepper-down.png old mode 100755 new mode 100644 diff --git a/data/themes/default/stepper-left-press.png b/data/themes/default/stepper-left-press.png old mode 100755 new mode 100644 diff --git a/data/themes/default/stepper-left.png b/data/themes/default/stepper-left.png old mode 100755 new mode 100644 diff --git a/data/themes/default/stepper-right-press.png b/data/themes/default/stepper-right-press.png old mode 100755 new mode 100644 diff --git a/data/themes/default/stepper-right.png b/data/themes/default/stepper-right.png old mode 100755 new mode 100644 diff --git a/data/themes/default/stepper-up-press.png b/data/themes/default/stepper-up-press.png old mode 100755 new mode 100644 diff --git a/data/themes/default/stepper-up.png b/data/themes/default/stepper-up.png old mode 100755 new mode 100644 diff --git a/data/themes/default/stop.png b/data/themes/default/stop.png old mode 100755 new mode 100644 diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 73f7547b7..dbcb39fa5 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -615,13 +615,13 @@ TrackContainerView QLabel /* common pattern colors */ TrackContentObjectView { - qproperty-mutedColor: rgb(255,255,255,100); + qproperty-mutedColor: rgba(255,255,255,100); qproperty-mutedBackgroundColor: #373d48; qproperty-selectedColor: #006B65; qproperty-BBPatternBackground: #373d48; qproperty-textColor: #fff; qproperty-textBackgroundColor: rgba(0, 0, 0, 75); - qproperty-textShadowColor: rgb(0,0,0,200); + qproperty-textShadowColor: rgba(0,0,0,200); qproperty-gradient: false; /* boolean property, set true to have a gradient */ font-size: 11px; diff --git a/data/themes/default/tempo_sync.png b/data/themes/default/tempo_sync.png old mode 100755 new mode 100644 diff --git a/data/themes/default/text_block.png b/data/themes/default/text_block.png old mode 100755 new mode 100644 diff --git a/data/themes/default/text_bold.png b/data/themes/default/text_bold.png old mode 100755 new mode 100644 diff --git a/data/themes/default/text_center.png b/data/themes/default/text_center.png old mode 100755 new mode 100644 diff --git a/data/themes/default/text_italic.png b/data/themes/default/text_italic.png old mode 100755 new mode 100644 diff --git a/data/themes/default/text_left.png b/data/themes/default/text_left.png old mode 100755 new mode 100644 diff --git a/data/themes/default/text_right.png b/data/themes/default/text_right.png old mode 100755 new mode 100644 diff --git a/data/themes/default/text_under.png b/data/themes/default/text_under.png old mode 100755 new mode 100644 diff --git a/data/themes/default/toolbar_bg.png b/data/themes/default/toolbar_bg.png old mode 100755 new mode 100644 diff --git a/data/themes/default/track_op_grip.png b/data/themes/default/track_op_grip.png old mode 100755 new mode 100644 diff --git a/data/themes/default/track_shadow_c.png b/data/themes/default/track_shadow_c.png old mode 100755 new mode 100644 diff --git a/data/themes/default/trackop.png b/data/themes/default/trackop.png old mode 100755 new mode 100644 diff --git a/data/themes/default/trackop_c.png b/data/themes/default/trackop_c.png old mode 100755 new mode 100644 diff --git a/data/themes/default/trackop_h.png b/data/themes/default/trackop_h.png old mode 100755 new mode 100644 diff --git a/data/themes/default/triangle_wave_active.png b/data/themes/default/triangle_wave_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/triangle_wave_inactive.png b/data/themes/default/triangle_wave_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/uhoh.png b/data/themes/default/uhoh.png old mode 100755 new mode 100644 diff --git a/data/themes/default/unavailable_sound.png b/data/themes/default/unavailable_sound.png old mode 100755 new mode 100644 diff --git a/data/themes/default/unknown_file.png b/data/themes/default/unknown_file.png old mode 100755 new mode 100644 diff --git a/data/themes/default/usr_wave_active.png b/data/themes/default/usr_wave_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/usr_wave_inactive.png b/data/themes/default/usr_wave_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/vst_plugin_file.png b/data/themes/default/vst_plugin_file.png old mode 100755 new mode 100644 diff --git a/data/themes/default/whatsthis.png b/data/themes/default/whatsthis.png old mode 100755 new mode 100644 diff --git a/data/themes/default/white_key.png b/data/themes/default/white_key.png old mode 100755 new mode 100644 diff --git a/data/themes/default/white_key_pressed.png b/data/themes/default/white_key_pressed.png old mode 100755 new mode 100644 diff --git a/data/themes/default/white_noise_wave_active.png b/data/themes/default/white_noise_wave_active.png old mode 100755 new mode 100644 diff --git a/data/themes/default/white_noise_wave_inactive.png b/data/themes/default/white_noise_wave_inactive.png old mode 100755 new mode 100644 diff --git a/data/themes/default/zoom.png b/data/themes/default/zoom.png old mode 100755 new mode 100644 diff --git a/data/themes/default/zoom_x.png b/data/themes/default/zoom_x.png old mode 100755 new mode 100644 diff --git a/data/themes/default/zoom_y.png b/data/themes/default/zoom_y.png old mode 100755 new mode 100644 diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h index 4bafbde4b..747bb94c2 100644 --- a/include/EnvelopeAndLfoParameters.h +++ b/include/EnvelopeAndLfoParameters.h @@ -121,6 +121,7 @@ private: static LfoInstances * s_lfoInstances; bool m_used; + QMutex m_paramMutex; FloatModel m_predelayModel; FloatModel m_attackModel; diff --git a/plugins/Eq/EqSpectrumView.cpp b/plugins/Eq/EqSpectrumView.cpp index 0f29ffec3..d44e01ece 100644 --- a/plugins/Eq/EqSpectrumView.cpp +++ b/plugins/Eq/EqSpectrumView.cpp @@ -1,9 +1,8 @@ /* eqspectrumview.cpp - implementation of EqSpectrumView class. * -* Copyright (c) 2014 David French +* Copyright (c) 2014-2017, David French * * This file is part of LMMS - https://lmms.io -* * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public * License as published by the Free Software Foundation; either @@ -38,6 +37,20 @@ EqAnalyser::EqAnalyser() : m_inProgress=false; m_specBuf = ( fftwf_complex * ) fftwf_malloc( ( FFT_BUFFER_SIZE + 1 ) * sizeof( fftwf_complex ) ); m_fftPlan = fftwf_plan_dft_r2c_1d( FFT_BUFFER_SIZE*2, m_buffer, m_specBuf, FFTW_MEASURE ); + + //initialize Blackman-Harris window, constants taken from + //https://en.wikipedia.org/wiki/Window_function#A_list_of_window_functions + const float a0 = 0.35875; + const float a1 = 0.48829; + const float a2 = 0.14128; + const float a3 = 0.01168; + + for(int i = 0; i < FFT_BUFFER_SIZE; i++) + { + m_fftWindow[i] = ( a0 - a1 * cosf( 2 * F_PI * i / (float)FFT_BUFFER_SIZE - 1 ) + + a2 * cosf( 4 * F_PI * i / (float)FFT_BUFFER_SIZE-1) + - a3 * cos( 6 * F_PI * i / (float)FFT_BUFFER_SIZE - 1.0 )); + } clear(); } @@ -84,6 +97,12 @@ void EqAnalyser::analyze( sampleFrame *buf, const fpp_t frames ) const int LOWEST_FREQ = 0; const int HIGHEST_FREQ = m_sampleRate / 2; + //apply FFT window + for( int i = 0; i < FFT_BUFFER_SIZE; i++ ) + { + m_buffer[i] = m_buffer[i] * m_fftWindow[i]; + } + fftwf_execute( m_fftPlan ); absspec( m_specBuf, m_absSpecBuf, FFT_BUFFER_SIZE+1 ); diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h index 2c615d888..cd3f17758 100644 --- a/plugins/Eq/EqSpectrumView.h +++ b/plugins/Eq/EqSpectrumView.h @@ -32,7 +32,6 @@ const int MAX_BANDS = 2048; - class EqAnalyser { public: @@ -61,6 +60,7 @@ private: int m_sampleRate; bool m_active; bool m_inProgress; + float m_fftWindow[FFT_BUFFER_SIZE]; }; diff --git a/src/core/EnvelopeAndLfoParameters.cpp b/src/core/EnvelopeAndLfoParameters.cpp index 4354c2418..ef23654d3 100644 --- a/src/core/EnvelopeAndLfoParameters.cpp +++ b/src/core/EnvelopeAndLfoParameters.cpp @@ -293,6 +293,8 @@ void EnvelopeAndLfoParameters::fillLevel( float * _buf, f_cnt_t _frame, const f_cnt_t _release_begin, const fpp_t _frames ) { + QMutexLocker m(&m_paramMutex); + if( _frame < 0 || _release_begin < 0 ) { return; @@ -404,6 +406,8 @@ void EnvelopeAndLfoParameters::loadSettings( const QDomElement & _this ) void EnvelopeAndLfoParameters::updateSampleVars() { + QMutexLocker m(&m_paramMutex); + const float frames_per_env_seg = SECS_PER_ENV_SEGMENT * Engine::mixer()->processingSampleRate(); diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp index b99660e79..bbcf8274e 100644 --- a/src/gui/AutomationPatternView.cpp +++ b/src/gui/AutomationPatternView.cpp @@ -265,7 +265,10 @@ void AutomationPatternView::paintEvent( QPaintEvent * ) lingrad.setColorAt( 1, c.darker( 300 ) ); lingrad.setColorAt( 0, c ); - + + // paint a black rectangle under the pattern to prevent glitches with transparent backgrounds + p.fillRect( rect(), QColor( 0, 0, 0 ) ); + if( gradient() ) { p.fillRect( rect(), lingrad ); @@ -482,8 +485,3 @@ void AutomationPatternView::scaleTimemapToFit( float oldMin, float oldMax ) m_pat->generateTangents(); } - - - - - diff --git a/src/gui/ExportProjectDialog.cpp b/src/gui/ExportProjectDialog.cpp index ef070c134..d17981c9e 100644 --- a/src/gui/ExportProjectDialog.cpp +++ b/src/gui/ExportProjectDialog.cpp @@ -206,6 +206,7 @@ void ExportProjectDialog::startExport() } } + void ExportProjectDialog::onFileFormatChanged(int index) { // Extract the format tag from the currently selected item, diff --git a/src/tracks/BBTrack.cpp b/src/tracks/BBTrack.cpp index dcb2a91a5..841050cc9 100644 --- a/src/tracks/BBTrack.cpp +++ b/src/tracks/BBTrack.cpp @@ -240,7 +240,10 @@ void BBTCOView::paintEvent( QPaintEvent * ) lingrad.setColorAt( 0, c.light( 130 ) ); lingrad.setColorAt( 1, c.light( 70 ) ); - + + // paint a black rectangle under the pattern to prevent glitches with transparent backgrounds + p.fillRect( rect(), QColor( 0, 0, 0 ) ); + if( gradient() ) { p.fillRect( rect(), lingrad ); diff --git a/src/tracks/Pattern.cpp b/src/tracks/Pattern.cpp index c6cb48e4a..a79b21107 100644 --- a/src/tracks/Pattern.cpp +++ b/src/tracks/Pattern.cpp @@ -891,6 +891,9 @@ void PatternView::paintEvent( QPaintEvent * ) lingrad.setColorAt( beatPattern ? 0 : 1, c.darker( 300 ) ); lingrad.setColorAt( beatPattern ? 1 : 0, c ); + // paint a black rectangle under the pattern to prevent glitches with transparent backgrounds + p.fillRect( rect(), QColor( 0, 0, 0 ) ); + if( gradient() ) { p.fillRect( rect(), lingrad ); @@ -1129,7 +1132,7 @@ void PatternView::paintEvent( QPaintEvent * ) paintTextLabel(m_pat->name(), p); } - if( !beatPattern ) + if( !( fixedTCOs() && beatPattern ) ) { // inner border p.setPen( c.lighter( current ? 160 : 130 ) ); diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp index 8ca8a4b90..3fe8035d9 100644 --- a/src/tracks/SampleTrack.cpp +++ b/src/tracks/SampleTrack.cpp @@ -478,6 +478,9 @@ void SampleTCOView::paintEvent( QPaintEvent * pe ) lingrad.setColorAt( 1, c.darker( 300 ) ); lingrad.setColorAt( 0, c ); + // paint a black rectangle under the pattern to prevent glitches with transparent backgrounds + p.fillRect( rect(), QColor( 0, 0, 0 ) ); + if( gradient() ) { p.fillRect( rect(), lingrad );