ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fix a few dangling uses of Ardour as program name, in favor of PROGRAM_NAME

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11563 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-02-29 20:18:18 +00:00
parent c69f050726
commit bb98baf413
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/ardour_ui.cc
View File

@ -3110,9 +3110,9 @@ require some unused files to continue to exist."));
}
if (removed > 1) {
txt.set_text (string_compose (plural_msg, removed, dead_directory, space_adjusted, bprefix));
txt.set_text (string_compose (plural_msg, removed, dead_directory, space_adjusted, bprefix, PROGRAM_NAME));
} else {
txt.set_text (string_compose (singular_msg, removed, dead_directory, space_adjusted, bprefix));
txt.set_text (string_compose (singular_msg, removed, dead_directory, space_adjusted, bprefix, PROGRAM_NAME));
}
dhbox.pack_start (*dimage, true, false, 5);
@ -3212,7 +3212,7 @@ Clean-up will move all unused files to a \"dead\" location."));
The following %1 files were not in use and \n\
have been moved to:\n\n\
%2\n\n\
After a restart of Ardour,\n\n\
After a restart of %5,\n\n\
Session -> Clean-up -> Flush Wastebasket\n\n\
will release an additional\n\
%3 %4bytes of disk space.\n"),
@ -3220,7 +3220,7 @@ will release an additional\n\
The following file was not in use and \n\
has been moved to:\n \
%2\n\n\
After a restart of Ardour,\n\n\
After a restart of %5,\n\n\
Session -> Clean-up -> Flush Wastebasket\n\n\
will release an additional\n\
%3 %4bytes of disk space.\n"

4
gtk2_ardour/rc_option_editor.cc
View File

@ -877,7 +877,7 @@ RCOptionEditor::RCOptionEditor ()
procs->add (i, string_compose (_("%1 processors"), i));
}
procs->set_note (_("This setting will only take effect when Ardour is restarted."));
procs->set_note (string_compose (_("This setting will only take effect when %1 is restarted."), PROGRAM_NAME));
add_option (_("Misc"), procs);
}
@ -1552,7 +1552,7 @@ RCOptionEditor::RCOptionEditor ()
add_option (S_("Visual|Interface"),
new BoolOption (
"use-own-plugin-gui",
_("Use plugins' own interface instead of Ardour's basic one"),
_("Use plugins' own interface instead of a builtin one"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_plugin_own_gui),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_plugin_own_gui)
));

2
gtk2_ardour/session_option_editor.cc
View File

@ -135,7 +135,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
add_option (_("Timecode"), new BoolOption (
"jack-time-master",
_("Ardour is JACK Time Master (provides Bar|Beat|Tick and other information to JACK)"),
string_compose (_("%1 is JACK Time Master (provides Bar|Beat|Tick and other information to JACK)"), PROGRAM_NAME),
sigc::mem_fun (*_session_config, &SessionConfiguration::get_jack_time_master),
sigc::mem_fun (*_session_config, &SessionConfiguration::set_jack_time_master)
));

1
libs/ardour/directory_names.cc
View File

@ -18,7 +18,6 @@ const char* const route_templates_dir_name = X_("route_templates");
const char* const surfaces_dir_name = X_("surfaces");
const char* const panner_dir_name = X_("panners");
/* these should end up using variants of PROGRAM_NAME */
#ifdef __APPLE__
const char* const user_config_dir_name = X_("Ardour" "3");

2
libs/ardour/export_handler.cc
View File

@ -424,7 +424,7 @@ ExportHandler::write_cue_header (CDMarkerStatus & status)
{
string title = status.timespan->name().compare ("Session") ? status.timespan->name() : (string) session.name();
status.out << "REM Cue file generated by Ardour" << endl;
status.out << "REM Cue file generated by " << PROGRAM_NAME << endl;
status.out << "TITLE " << cue_escape_cdtext (title) << endl;
/* The original cue sheet sepc metions five file types

2
libs/ardour/session_vst.cc
View File

@ -282,7 +282,7 @@ intptr_t Session::vst_callback (
case audioMasterGetProductString:
SHOW_CALLBACK ("amc: audioMasterGetProductString\n");
// fills <ptr> with a string with product name (max 64 char)
strcpy ((char*) ptr, "Ardour");
strcpy ((char*) ptr, PROGRAM_NAME);
return 0;
case audioMasterGetVendorVersion: