smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 04:39:33 +01:00
Code Issues Projects Releases Wiki Activity

[SUmmary] Making black list filename for keybindings platform dependent.

Browse source
This commit is contained in:
VKamyshniy 2015-02-16 22:05:00 +02:00
parent 100668b18c
commit 18ffbfa427
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/keyeditor.cc
View file

@ -50,6 +50,16 @@ using namespace PBD;
using Gtkmm2ext::Keyboard;
#if defined(PLATFORM_WINDOWS)
const char* KeyEditor::blacklist_filename = "keybindings.win.blacklist";
#elif defined(__APPLE__)
const char* KeyEditor::blacklist_filename = "keybindings.mac.blacklist";
#else
const char* KeyEditor::blacklist_filename = "keybindings.blacklist";
#endif
const char* KeyEditor::whitelist_filename = "keybindings.whitelist";
KeyEditor::KeyEditor ()
: WavesDialog ("waves_keyeditor.xml", true, false)
, view (get_tree_view ("view"))
@ -85,7 +95,7 @@ KeyEditor::load_blackwhitelists ()
{
string list;
if (find_file (ARDOUR::ardour_data_search_path(), X_("keybindings.blacklist"), list)) {
if (find_file (ARDOUR::ardour_data_search_path(), X_(blacklist_filename), list)) {
ifstream in (list.c_str());
while (in) {
@ -95,7 +105,7 @@ KeyEditor::load_blackwhitelists ()
}
}
if (find_file (ARDOUR::ardour_data_search_path(), X_("keybindings.whitelist"), list)) {
if (find_file (ARDOUR::ardour_data_search_path(), X_(whitelist_filename), list)) {
ifstream in (list.c_str());
while (in) {

3
gtk2_ardour/keyeditor.h
View file

@ -59,6 +59,9 @@ class KeyEditor : public WavesDialog
WavesButton& unbind_button;
WavesButton& reset_button;
static const char* blacklist_filename;
static const char* whitelist_filename;
void unbind (WavesButton*);
bool can_bind;