diff options
Diffstat (limited to 'libs')
| -rw-r--r--[-rwxr-xr-x] | libs/ardour/ardour/linux_vst_support.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libs/ardour/ardour/lxvst_plugin.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libs/ardour/ardour/public_diskstream.h | 0 | ||||
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | libs/ardour/ardour/unknown_processor.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libs/ardour/ardour/vestige/aeffectx.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libs/ardour/export_failed.cc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libs/ardour/lxvst_plugin.cc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libs/ardour/test/data/mantis_3356/interchange/mantis_3356/midifiles/Midi 1-1.mid | bin | 106 -> 106 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | libs/ardour/test/data/test.wav | bin | 17720 -> 17720 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | libs/ardour/unknown_processor.cc | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | libs/evoral/test/testdata/TakeFive.mid | bin | 32531 -> 32531 bytes | |||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/keyboard.h | 5 | ||||
| -rw-r--r-- | libs/gtkmm2ext/keyboard.cc | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | libs/pbd/test/testrunner.cc | 0 |
15 files changed, 11 insertions, 0 deletions
diff --git a/libs/ardour/ardour/linux_vst_support.h b/libs/ardour/ardour/linux_vst_support.h index c99c4a8cb3..c99c4a8cb3 100755..100644 --- a/libs/ardour/ardour/linux_vst_support.h +++ b/libs/ardour/ardour/linux_vst_support.h diff --git a/libs/ardour/ardour/lxvst_plugin.h b/libs/ardour/ardour/lxvst_plugin.h index 58bc626d32..58bc626d32 100755..100644 --- a/libs/ardour/ardour/lxvst_plugin.h +++ b/libs/ardour/ardour/lxvst_plugin.h diff --git a/libs/ardour/ardour/public_diskstream.h b/libs/ardour/ardour/public_diskstream.h index da481a6dee..da481a6dee 100755..100644 --- a/libs/ardour/ardour/public_diskstream.h +++ b/libs/ardour/ardour/public_diskstream.h diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index f19f8fe808..d8440f24f3 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -192,6 +192,7 @@ CONFIG_VARIABLE (bool, sound_midi_notes, "sound-midi-notes", false) CONFIG_VARIABLE (bool, use_plugin_own_gui, "use-plugin-own-gui", true) CONFIG_VARIABLE (uint32_t, max_recent_sessions, "max-recent-sessions", 10) CONFIG_VARIABLE (double, automation_thinning_factor, "automation-thinning-factor", 20.0) +CONFIG_VARIABLE (std::string, freesound_download_dir, "freesound-download-dir", Glib::get_home_dir() + "/Freesound/snd") /* denormal management */ diff --git a/libs/ardour/ardour/unknown_processor.h b/libs/ardour/ardour/unknown_processor.h index 36981030ce..36981030ce 100755..100644 --- a/libs/ardour/ardour/unknown_processor.h +++ b/libs/ardour/ardour/unknown_processor.h diff --git a/libs/ardour/ardour/vestige/aeffectx.h b/libs/ardour/ardour/vestige/aeffectx.h index 5238df1c75..5238df1c75 100755..100644 --- a/libs/ardour/ardour/vestige/aeffectx.h +++ b/libs/ardour/ardour/vestige/aeffectx.h diff --git a/libs/ardour/export_failed.cc b/libs/ardour/export_failed.cc index 97f2ee56ac..97f2ee56ac 100755..100644 --- a/libs/ardour/export_failed.cc +++ b/libs/ardour/export_failed.cc diff --git a/libs/ardour/lxvst_plugin.cc b/libs/ardour/lxvst_plugin.cc index 6e30e0c443..6e30e0c443 100755..100644 --- a/libs/ardour/lxvst_plugin.cc +++ b/libs/ardour/lxvst_plugin.cc diff --git a/libs/ardour/test/data/mantis_3356/interchange/mantis_3356/midifiles/Midi 1-1.mid b/libs/ardour/test/data/mantis_3356/interchange/mantis_3356/midifiles/Midi 1-1.mid Binary files differindex 528a1b5b4d..528a1b5b4d 100755..100644 --- a/libs/ardour/test/data/mantis_3356/interchange/mantis_3356/midifiles/Midi 1-1.mid +++ b/libs/ardour/test/data/mantis_3356/interchange/mantis_3356/midifiles/Midi 1-1.mid diff --git a/libs/ardour/test/data/test.wav b/libs/ardour/test/data/test.wav Binary files differindex 369531cc91..369531cc91 100755..100644 --- a/libs/ardour/test/data/test.wav +++ b/libs/ardour/test/data/test.wav diff --git a/libs/ardour/unknown_processor.cc b/libs/ardour/unknown_processor.cc index f6c713404f..f6c713404f 100755..100644 --- a/libs/ardour/unknown_processor.cc +++ b/libs/ardour/unknown_processor.cc diff --git a/libs/evoral/test/testdata/TakeFive.mid b/libs/evoral/test/testdata/TakeFive.mid Binary files differindex 0d472ac6cb..0d472ac6cb 100755..100644 --- a/libs/evoral/test/testdata/TakeFive.mid +++ b/libs/evoral/test/testdata/TakeFive.mid diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h index 909f791403..84988e1525 100644 --- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h +++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h @@ -59,6 +59,11 @@ class Keyboard : public sigc::trackable, PBD::Stateful static uint32_t GainFineScaleModifier; static uint32_t GainExtraFineScaleModifier; + // Modifiers for scroll wheel + static uint32_t ScrollZoomVerticalModifier; + static uint32_t ScrollZoomHorizontalModifier; + static uint32_t ScrollHorizontalModifier; + static const char* primary_modifier_name (); static const char* secondary_modifier_name (); static const char* tertiary_modifier_name (); diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 9966972edb..f694471d9a 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -94,6 +94,11 @@ const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); } guint Keyboard::GainFineScaleModifier = Keyboard::PrimaryModifier; guint Keyboard::GainExtraFineScaleModifier = Keyboard::SecondaryModifier; +guint Keyboard::ScrollZoomVerticalModifier = Keyboard::SecondaryModifier; +guint Keyboard::ScrollZoomHorizontalModifier = Keyboard::PrimaryModifier; +guint Keyboard::ScrollHorizontalModifier = Keyboard::TertiaryModifier; + + Keyboard* Keyboard::_the_keyboard = 0; Gtk::Window* Keyboard::current_window = 0; bool Keyboard::_some_magic_widget_has_focus = false; diff --git a/libs/pbd/test/testrunner.cc b/libs/pbd/test/testrunner.cc index 1512ebd024..1512ebd024 100755..100644 --- a/libs/pbd/test/testrunner.cc +++ b/libs/pbd/test/testrunner.cc |