smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

Install everything to *ardour3* instead of *ardour2*.

Browse source 
Fix initial display of keys and scroomer on new MIDI tracks.
Remove console barf.


git-svn-id: svn://localhost/ardour2/trunk@2909 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-01-13 21:34:04 +00:00
parent 2db91c126e
commit 794917fca7
21 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PACKAGER_README
View file

@ -12,4 +12,4 @@ file) will be removed.
(2) STANDARD TEMPLATES (2) STANDARD TEMPLATES
The templates in ./templates are intended for installation in The templates in ./templates are intended for installation in
$prefix/share/ardour2/templates. $prefix/share/ardour3/templates.

8
SConstruct
View file

@ -1236,12 +1236,12 @@ if os.path.exists('.svn'):
the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision) the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision)
remove_ardour = env.Command ('frobnicatory_decoy2', [], remove_ardour = env.Command ('frobnicatory_decoy2', [],
[ Delete ('$PREFIX/etc/ardour2'), [ Delete ('$PREFIX/etc/ardour3'),
Delete ('$PREFIX/lib/ardour2'), Delete ('$PREFIX/lib/ardour3'),
Delete ('$PREFIX/bin/ardour2')]) Delete ('$PREFIX/bin/ardour3')])
env.Alias('revision', the_revision) env.Alias('revision', the_revision)
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour_system.rc'))
env.Alias('uninstall', remove_ardour) env.Alias('uninstall', remove_ardour)
Default (sysrcbuild) Default (sysrcbuild)

34
gtk2_ardour/SConscript
View file

@ -401,8 +401,8 @@ else:
my_font_dict['%FONT_ITALIC_HUGER%'] = 'sans italic 34' my_font_dict['%FONT_ITALIC_HUGER%'] = 'sans italic 34'
my_font_dict['%FONT_ITALIC_MASSIVE%'] = 'sans italic 60' 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_dark_theme = env.SubstInFile ('ardour3_ui_dark.rc', 'ardour3_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_light_theme = env.SubstInFile ('ardour3_ui_light.rc', 'ardour3_ui_light.rc.in', SUBST_DICT = my_font_dict)
my_subst_dict = { } my_subst_dict = { }
@ -456,7 +456,7 @@ Default(ardour_light_theme)
if env['VST']: if env['VST']:
Default(ardourlib) Default(ardourlib)
# the library - into the library dir # 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: else:
if env['VERSIONED']: if env['VERSIONED']:
@ -467,25 +467,25 @@ else:
#install #install
# the executable - into the library dir # 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 # 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']: if env['NLS']:
i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env) i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env)
# configuration files # 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, 'ardour3'), 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, 'ardour3'), 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, 'ardour3'), '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, 'ardour3'), '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, 'ardour3'), '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, 'ardour3'), '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-sae-de.bindings'))
# data files # 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', 'ardour3'), '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', 'ardour3', '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', 'icons'), icon_files))
env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], [])) env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))
@ -496,12 +496,12 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
'ardour.sh.in', 'ardour.sh.in',
'ardev_common.sh.in', 'ardev_common.sh.in',
'ardev', 'ardbg', '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.menus', 'ardour-sae.menus',
'ardour.bindings.in', 'ardour.bindings.in',
'ardour-sae-ansi.bindings.in', 'ardour-sae-ansi.bindings.in',
'ardour-sae-de.bindings.in', 'ardour-sae-de.bindings.in',
'ardour2_ui_default.conf', 'ardour3_ui_default.conf',
'editor_xpms' 'editor_xpms'
] + ] +
gtkardour_files + gtkardour_files +

2
gtk2_ardour/ardev_common.sh.in
View file

@ -11,6 +11,6 @@ export LD_LIBRARY_PATH=libs/vamp-sdk:libs/surfaces/control_protocol:libs/ardour:
# DYLD_LIBRARY_PATH is for darwin. # DYLD_LIBRARY_PATH is for darwin.
export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
# For the internal clearlooks engine # For the internal clearlooks engine
export GTK_PATH=$PWD/libs/clearlooks:~/.ardour2 export GTK_PATH=$PWD/libs/clearlooks:~/.ardour3
EXECUTABLE=gtk2_ardour/ardour-%VERSION% EXECUTABLE=gtk2_ardour/ardour-%VERSION%

6
gtk2_ardour/ardour.sh.in
View file

@ -1,8 +1,8 @@
#!/bin/sh #!/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 # DYLD_LIBRARY_PATH is for Darwin
export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
@ -15,6 +15,6 @@ fi
ulimit -c unlimited ulimit -c unlimited
exec %INSTALL_PREFIX%/%LIBDIR%/ardour2/ardour-%VERSION% "$@" exec %INSTALL_PREFIX%/%LIBDIR%/ardour3/ardour-%VERSION% "$@"

0
gtk2_ardour/ardour2_ui_dark.rc.in → gtk2_ardour/ardour3_ui_dark.rc.in
View file

2
gtk2_ardour/ardour2_ui_default.conf → gtk2_ardour/ardour3_ui_default.conf
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Ardour> <Ardour>
<UI> <UI>
<Option name="ui-rc-file" value="ardour2_ui_dark.rc"/> <Option name="ui-rc-file" value="ardour3_ui_dark.rc"/>
</UI> </UI>
<Canvas> <Canvas>
<Option name="waveform" value="000000cc"/> <Option name="waveform" value="000000cc"/>

0
gtk2_ardour/ardour2_ui_light.rc.in → gtk2_ardour/ardour3_ui_light.rc.in
View file

6
gtk2_ardour/midi_streamview.cc
View file

@ -605,11 +605,11 @@ MidiStreamView::note_range_adjustment_changed() {
int highest; int highest;
if(sum == _range_sum_cache) { if(sum == _range_sum_cache) {
cerr << "cached" << endl; //cerr << "cached" << endl;
highest = (int) floor(sum); highest = (int) floor(sum);
} }
else { else {
cerr << "recalc" << endl; //cerr << "recalc" << endl;
highest = lowest + (int) floor(note_range_adjustment.get_page_size()); highest = lowest + (int) floor(note_range_adjustment.get_page_size());
_range_sum_cache = sum; _range_sum_cache = sum;
} }
@ -618,7 +618,7 @@ MidiStreamView::note_range_adjustment_changed() {
return; 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; //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); set_note_range(lowest, highest);

6
gtk2_ardour/midi_time_axis.cc
View file

@ -128,7 +128,6 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar
/* ask for notifications of any new RegionViews */ /* ask for notifications of any new RegionViews */
_view->attach (); _view->attach ();
} }
} }
@ -148,7 +147,10 @@ MidiTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent)
ensure_xml_node (); ensure_xml_node ();
xml_node->add_property ("shown_editor", "yes"); 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 void

2
gtk2_ardour/opts.cc
View file

@ -63,7 +63,7 @@ print_help (const char *execname)
#endif #endif
<< _(" [session-name] Name of session to load\n") << _(" [session-name] Name of session to load\n")
<< _(" -C, --curvetest filename Curve algorithm debugger\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; return 1;

2
gtk2_ardour/piano_roll_header.cc
View file

@ -628,7 +628,7 @@ void
PianoRollHeader::send_note_on(uint8_t note) { PianoRollHeader::send_note_on(uint8_t note) {
boost::shared_ptr<ARDOUR::MidiTrack> track = _view.trackview().midi_track(); boost::shared_ptr<ARDOUR::MidiTrack> track = _view.trackview().midi_track();
cerr << "note on: " << (int) note << endl; //cerr << "note on: " << (int) note << endl;
if(track) { if(track) {
_event[0] = MIDI_CMD_NOTE_ON; _event[0] = MIDI_CMD_NOTE_ON;

8
gtk2_ardour/theme_manager.cc
View file

@ -209,7 +209,7 @@ ThemeManager::on_dark_theme_button_toggled()
{ {
if (!dark_button.get_active()) return; 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); 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; 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); 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(); rcfile = ARDOUR_UI::config()->ui_rc_file.get();
} }
if (rcfile == "ardour2_ui_dark.rc") { if (rcfile == "ardour3_ui_dark.rc") {
dark_button.set_active(); dark_button.set_active();
} else if (rcfile == "ardour2_ui_light.rc") { } else if (rcfile == "ardour3_ui_light.rc") {
light_button.set_active(); light_button.set_active();
} }

6
gtk2_ardour/ui_config.cc
View file

@ -64,7 +64,7 @@ UIConfiguration::load_state ()
sys::path default_ui_rc_file; sys::path default_ui_rc_file;
if ( find_file_in_search_path (ardour_search_path() + system_config_search_path(), 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; XMLTree tree;
found = true; found = true;
@ -87,7 +87,7 @@ UIConfiguration::load_state ()
sys::path user_ui_rc_file; sys::path user_ui_rc_file;
if (find_file_in_search_path (ardour_search_path() + user_config_directory(), 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; XMLTree tree;
found = true; found = true;
@ -131,7 +131,7 @@ UIConfiguration::save_state()
sys::path rcfile_path(user_config_directory()); sys::path rcfile_path(user_config_directory());
rcfile_path /= "ardour2_ui.conf"; rcfile_path /= "ardour3_ui.conf";
const string rcfile = rcfile_path.to_string(); const string rcfile = rcfile_path.to_string();
// this test seems bogus? // this test seems bogus?

2
gtk2_ardour/ui_config_vars.h
View file

@ -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")

2
libs/ardour/SConscript
View file

@ -355,7 +355,7 @@ if env['NLS']:
i18n (ardour, ardour_files + vst_files + coreaudio_files + timefx_sources + audiounit_files, env) i18n (ardour, ardour_files + vst_files + coreaudio_files + timefx_sources + audiounit_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libardour)) env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libardour))
env.Alias('version', ardour.VersionBuild(['version.cc', 'ardour/version.h'], [])) env.Alias('version', ardour.VersionBuild(['version.cc', 'ardour/version.h'], []))

2
libs/ardour/directory_names.cc
View file

@ -14,6 +14,6 @@ const char* const interchange_dir_name = X_("interchange");
const char* const export_dir_name = X_("export"); const char* const export_dir_name = X_("export");
const char* const templates_dir_name = X_("templates"); const char* const templates_dir_name = X_("templates");
const char* const surfaces_dir_name = X_("surfaces"); const char* const surfaces_dir_name = X_("surfaces");
const char* const user_config_dir_name = X_(".ardour2"); const char* const user_config_dir_name = X_(".ardour3");
} }

2
libs/ardour/diskstream.cc
View file

@ -56,7 +56,7 @@ using namespace std;
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;
/* XXX This goes uninitialized when there is no ~/.ardour2 directory. /* XXX This goes uninitialized when there is no ~/.ardour3 directory.
* I can't figure out why, so this will do for now (just stole the * I can't figure out why, so this will do for now (just stole the
* default from configuration_vars.h). 0 is not a good value for * default from configuration_vars.h). 0 is not a good value for
* allocating buffer sizes.. * allocating buffer sizes..

6
libs/ardour/filesystem_paths.cc
View file

@ -56,7 +56,7 @@ sys::path
ardour_module_directory () ardour_module_directory ()
{ {
sys::path module_directory(MODULE_DIR); sys::path module_directory(MODULE_DIR);
module_directory /= "ardour2"; module_directory /= "ardour3";
return module_directory; return module_directory;
} }
@ -80,7 +80,7 @@ system_config_search_path ()
#endif #endif
config_path.add_subdirectory_to_paths("ardour2"); config_path.add_subdirectory_to_paths("ardour3");
return config_path; return config_path;
} }
@ -98,7 +98,7 @@ system_data_search_path ()
#endif #endif
data_path.add_subdirectory_to_paths("ardour2"); data_path.add_subdirectory_to_paths("ardour3");
return data_path; return data_path;
} }

4
libs/gtkmm2ext/scroomer.cc
View file

@ -264,8 +264,6 @@ void
Scroomer::on_size_allocate (Allocation& a) { Scroomer::on_size_allocate (Allocation& a) {
Gtk::DrawingArea::on_size_allocate(a); Gtk::DrawingArea::on_size_allocate(a);
cerr << "allocate" << endl;
position[Total] = a.get_height(); position[Total] = a.get_height();
set_min_page_size(min_page_size); set_min_page_size(min_page_size);
update(); update();
@ -314,7 +312,7 @@ Scroomer::set_min_page_size(double ps) {
void void
Scroomer::update() { Scroomer::update() {
double range = adj.get_upper() - adj.get_lower(); double range = adj.get_upper() - adj.get_lower();
double value = adj.get_value() - adj.get_lower(); //double value = adj.get_value() - adj.get_lower();
int height = position[Total]; int height = position[Total];
double coeff = ((double) height) / range; double coeff = ((double) height) / range;

0
tools/osx_packaging/ardour2_mac_ui.rc → tools/osx_packaging/ardour3_mac_ui.rc
View file