diff options
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/SConscript | 34 | ||||
-rw-r--r-- | gtk2_ardour/ardev_common.sh.in | 2 | ||||
-rw-r--r-- | gtk2_ardour/ardour.sh.in | 6 | ||||
-rw-r--r-- | gtk2_ardour/ardour3_ui_dark.rc.in (renamed from gtk2_ardour/ardour2_ui_dark.rc.in) | 0 | ||||
-rw-r--r-- | gtk2_ardour/ardour3_ui_default.conf (renamed from gtk2_ardour/ardour2_ui_default.conf) | 2 | ||||
-rw-r--r-- | gtk2_ardour/ardour3_ui_light.rc.in (renamed from gtk2_ardour/ardour2_ui_light.rc.in) | 0 | ||||
-rw-r--r-- | gtk2_ardour/midi_streamview.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/opts.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/piano_roll_header.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/theme_manager.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/ui_config.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/ui_config_vars.h | 2 |
13 files changed, 39 insertions, 37 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index f03286243b..24fd461c37 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -401,8 +401,8 @@ else: my_font_dict['%FONT_ITALIC_HUGER%'] = 'sans italic 34' my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'sans italic 60' -ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict) -ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict) +ardour_dark_theme = env.SubstInFile ('ardour3_ui_dark.rc', 'ardour3_ui_dark.rc.in', SUBST_DICT = my_font_dict) +ardour_light_theme = env.SubstInFile ('ardour3_ui_light.rc', 'ardour3_ui_light.rc.in', SUBST_DICT = my_font_dict) my_subst_dict = { } @@ -456,7 +456,7 @@ Default(ardour_light_theme) if env['VST']: Default(ardourlib) # the library - into the library dir - env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardourlib)) + env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), ardourlib)) else: if env['VERSIONED']: @@ -467,25 +467,25 @@ else: #install # the executable - into the library dir - env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardour)) + env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), ardour)) # the script - into the bin dir - env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh)) + env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour3', ardoursh)) if env['NLS']: i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env) # configuration files -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_dark_theme)) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), ardour_light_theme)) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour-sae.menus')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour-sae-ansi.bindings')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour-sae-de.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_dark_theme)) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_light_theme)) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour.menus')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour-sae.menus')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour-sae-ansi.bindings')) +env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour-sae-de.bindings')) # data files -env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2'), 'splash.png')) -env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'pixmaps'), pixmap_files)) -env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'icons'), icon_files)) +env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3'), 'splash.png')) +env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'pixmaps'), pixmap_files)) +env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'icons'), icon_files)) env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], [])) @@ -496,12 +496,12 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'], 'ardour.sh.in', 'ardev_common.sh.in', 'ardev', 'ardbg', - 'ardour2_ui_dark.rc.in', 'ardour2_ui_light.rc.in', 'splash.png', + 'ardour3_ui_dark.rc.in', 'ardour3_ui_light.rc.in', 'splash.png', 'ardour.menus', 'ardour-sae.menus', 'ardour.bindings.in', 'ardour-sae-ansi.bindings.in', 'ardour-sae-de.bindings.in', - 'ardour2_ui_default.conf', + 'ardour3_ui_default.conf', 'editor_xpms' ] + gtkardour_files + diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index a34bae1256..d93f108143 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -11,6 +11,6 @@ export LD_LIBRARY_PATH=libs/vamp-sdk:libs/surfaces/control_protocol:libs/ardour: # DYLD_LIBRARY_PATH is for darwin. export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH # For the internal clearlooks engine -export GTK_PATH=$PWD/libs/clearlooks:~/.ardour2 +export GTK_PATH=$PWD/libs/clearlooks:~/.ardour3 EXECUTABLE=gtk2_ardour/ardour-%VERSION% diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in index 2f1092c3fe..1cd8ada3ef 100644 --- a/gtk2_ardour/ardour.sh.in +++ b/gtk2_ardour/ardour.sh.in @@ -1,8 +1,8 @@ #!/bin/sh -export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$GTK_PATH +export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour3:$GTK_PATH -export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour3:$LD_LIBRARY_PATH # DYLD_LIBRARY_PATH is for Darwin export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH @@ -15,6 +15,6 @@ fi ulimit -c unlimited -exec %INSTALL_PREFIX%/%LIBDIR%/ardour2/ardour-%VERSION% "$@" +exec %INSTALL_PREFIX%/%LIBDIR%/ardour3/ardour-%VERSION% "$@" diff --git a/gtk2_ardour/ardour2_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in index b2b5edd2d5..b2b5edd2d5 100644 --- a/gtk2_ardour/ardour2_ui_dark.rc.in +++ b/gtk2_ardour/ardour3_ui_dark.rc.in diff --git a/gtk2_ardour/ardour2_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf index c45e4da9c6..42f5741e4d 100644 --- a/gtk2_ardour/ardour2_ui_default.conf +++ b/gtk2_ardour/ardour3_ui_default.conf @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Ardour> <UI> - <Option name="ui-rc-file" value="ardour2_ui_dark.rc"/> + <Option name="ui-rc-file" value="ardour3_ui_dark.rc"/> </UI> <Canvas> <Option name="waveform" value="000000cc"/> diff --git a/gtk2_ardour/ardour2_ui_light.rc.in b/gtk2_ardour/ardour3_ui_light.rc.in index e5cf578620..e5cf578620 100644 --- a/gtk2_ardour/ardour2_ui_light.rc.in +++ b/gtk2_ardour/ardour3_ui_light.rc.in diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 172d30b7ef..a1deba9ba9 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -605,11 +605,11 @@ MidiStreamView::note_range_adjustment_changed() { int highest; if(sum == _range_sum_cache) { - cerr << "cached" << endl; + //cerr << "cached" << endl; highest = (int) floor(sum); } else { - cerr << "recalc" << endl; + //cerr << "recalc" << endl; highest = lowest + (int) floor(note_range_adjustment.get_page_size()); _range_sum_cache = sum; } @@ -618,7 +618,7 @@ MidiStreamView::note_range_adjustment_changed() { return; } - cerr << "note range changed: " << lowest << " " << highest << endl; + //cerr << "note range changed: " << lowest << " " << highest << endl; //cerr << " val=" << v_zoom_adjustment.get_value() << " page=" << v_zoom_adjustment.get_page_size() << " sum=" << v_zoom_adjustment.get_value() + v_zoom_adjustment.get_page_size() << endl; set_note_range(lowest, highest); diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index b3892d2790..343e869292 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -128,7 +128,6 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar /* ask for notifications of any new RegionViews */ _view->attach (); - } } @@ -148,7 +147,10 @@ MidiTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) ensure_xml_node (); xml_node->add_property ("shown_editor", "yes"); - return TimeAxisView::show_at (y, nth, parent); + guint32 ret = TimeAxisView::show_at (y, nth, parent); + _piano_roll_header->show(); + _range_scroomer->show(); + return ret; } void diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc index 00aa5cf94e..f2f255c953 100644 --- a/gtk2_ardour/opts.cc +++ b/gtk2_ardour/opts.cc @@ -63,7 +63,7 @@ print_help (const char *execname) #endif << _(" [session-name] Name of session to load\n") << _(" -C, --curvetest filename Curve algorithm debugger\n") - << _(" -k, --keybindings filename Name of key bindings to load (default is ~/.ardour2/ardour.bindings)\n") + << _(" -k, --keybindings filename Name of key bindings to load (default is ~/.ardour3/ardour.bindings)\n") ; return 1; diff --git a/gtk2_ardour/piano_roll_header.cc b/gtk2_ardour/piano_roll_header.cc index 8be0bc86c1..95ebba4aeb 100644 --- a/gtk2_ardour/piano_roll_header.cc +++ b/gtk2_ardour/piano_roll_header.cc @@ -628,7 +628,7 @@ void PianoRollHeader::send_note_on(uint8_t note) { boost::shared_ptr<ARDOUR::MidiTrack> track = _view.trackview().midi_track(); - cerr << "note on: " << (int) note << endl; + //cerr << "note on: " << (int) note << endl; if(track) { _event[0] = MIDI_CMD_NOTE_ON; diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index d7b4c99f92..f529405878 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -209,7 +209,7 @@ ThemeManager::on_dark_theme_button_toggled() { if (!dark_button.get_active()) return; - ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_dark.rc"); + ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_dark.rc"); load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true); } @@ -218,7 +218,7 @@ ThemeManager::on_light_theme_button_toggled() { if (!light_button.get_active()) return; - ARDOUR_UI::config()->ui_rc_file.set("ardour2_ui_light.rc"); + ARDOUR_UI::config()->ui_rc_file.set("ardour3_ui_light.rc"); load_rc_file (ARDOUR_UI::config()->ui_rc_file.get(), true); } @@ -253,9 +253,9 @@ ThemeManager::setup_theme () rcfile = ARDOUR_UI::config()->ui_rc_file.get(); } - if (rcfile == "ardour2_ui_dark.rc") { + if (rcfile == "ardour3_ui_dark.rc") { dark_button.set_active(); - } else if (rcfile == "ardour2_ui_light.rc") { + } else if (rcfile == "ardour3_ui_light.rc") { light_button.set_active(); } diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index 13db1f8803..80cd612ee7 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -64,7 +64,7 @@ UIConfiguration::load_state () sys::path default_ui_rc_file; if ( find_file_in_search_path (ardour_search_path() + system_config_search_path(), - "ardour2_ui_default.conf", default_ui_rc_file) ) + "ardour3_ui_default.conf", default_ui_rc_file) ) { XMLTree tree; found = true; @@ -87,7 +87,7 @@ UIConfiguration::load_state () sys::path user_ui_rc_file; if (find_file_in_search_path (ardour_search_path() + user_config_directory(), - "ardour2_ui.conf", user_ui_rc_file)) + "ardour3_ui.conf", user_ui_rc_file)) { XMLTree tree; found = true; @@ -131,7 +131,7 @@ UIConfiguration::save_state() sys::path rcfile_path(user_config_directory()); - rcfile_path /= "ardour2_ui.conf"; + rcfile_path /= "ardour3_ui.conf"; const string rcfile = rcfile_path.to_string(); // this test seems bogus? diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h index ccae71b94b..1fa288867f 100644 --- a/gtk2_ardour/ui_config_vars.h +++ b/gtk2_ardour/ui_config_vars.h @@ -1,2 +1,2 @@ -UI_CONFIG_VARIABLE(std::string, ui_rc_file, "ui-rc-file", "ardour2_ui_dark.rc") +UI_CONFIG_VARIABLE(std::string, ui_rc_file, "ui-rc-file", "ardour3_ui_dark.rc") |