summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardev_common.sh.in1
-rw-r--r--gtk2_ardour/editor_regions.cc2
-rw-r--r--gtk2_ardour/mnemonic-us.bindings.in2
-rw-r--r--gtk2_ardour/opts.cc2
-rw-r--r--gtk2_ardour/sfdb_ui.cc8
-rw-r--r--gtk2_ardour/transcode_ffmpeg.cc24
-rw-r--r--gtk2_ardour/video_server_dialog.cc9
-rw-r--r--gtk2_ardour/video_timeline.cc4
8 files changed, 31 insertions, 21 deletions
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index d65a287701..e5a424af6a 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -18,6 +18,7 @@ export ARDOUR_MIDIMAPS_PATH=$TOP/midi_maps:.
export ARDOUR_MCP_PATH=$TOP/mcp:.
export ARDOUR_EXPORT_FORMATS_PATH=$TOP/export:.
export ARDOUR_BACKEND_PATH=$libs/backends/jack:$libs/backends/wavesaudio:$libs/backends/dummy
+export ARDOUR_TEST_PATH=$libs/ardour/test/data
#
# even though we set the above variables, ardour requires that these
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index bf13bd5a65..69620d489f 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -114,7 +114,7 @@ EditorRegions::EditorRegions (Editor* e)
{ 3, _("Length"), _("Length of the region") },
{ 4, _("Sync"), _("Position of region sync point, relative to start of the region") },
{ 5, _("Fade In"), _("Length of region fade-in (units: secondary clock), () if disabled") },
- { 6, _("Fade Out"), _("Length of region fade-out (units: secondary clock), () if dsisabled") },
+ { 6, _("Fade Out"), _("Length of region fade-out (units: secondary clock), () if disabled") },
{ 7, _("L"), _("Region position locked?") },
{ 8, _("G"), _("Region position glued to Bars|Beats time?") },
{ 9, _("M"), _("Region muted?") },
diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/mnemonic-us.bindings.in
index d0bc802b0e..9b4479a4f7 100644
--- a/gtk2_ardour/mnemonic-us.bindings.in
+++ b/gtk2_ardour/mnemonic-us.bindings.in
@@ -339,7 +339,7 @@ This mode provides many different operations on both regions and control points,
@trans|Transport/ToggleAutoPlay|5|toggle auto play
@trans|Transport/ToggleAutoReturn|6|toggle auto return
@trans|Transport/ToggleClick|7|toggle click (metronome)
-@ranges|Editor/set-tempo-from-region|9|set tempo (1 bar) from region(s)
+@ranges|Region/set-tempo-from-region|9|set tempo (1 bar) from region(s)
@ranges|Editor/set-tempo-from-edit-range|0|set tempo (1 bar) from edit range
; mouse stuff
diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index 90d753af4c..4596b5c62c 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -102,7 +102,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
{ "help", 0, 0, 'h' },
{ "no-announcements", 0, 0, 'a' },
{ "bindings", 0, 0, 'b' },
- { "disable-plugins", 1, 0, 'd' },
+ { "disable-plugins", 0, 0, 'd' },
{ "debug", 1, 0, 'D' },
{ "no-splash", 0, 0, 'n' },
{ "menus", 1, 0, 'm' },
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 8011268335..72cd75abb1 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -281,7 +281,7 @@ SoundFileBox::setup_labels (const string& filename)
string error_msg;
- if (SMFSource::safe_midi_file_extension (path)) {
+ if (SMFSource::valid_midi_file (path)) {
boost::shared_ptr<SMFSource> ms =
boost::dynamic_pointer_cast<SMFSource> (
@@ -406,7 +406,7 @@ SoundFileBox::audition ()
boost::shared_ptr<Region> r;
- if (SMFSource::safe_midi_file_extension (path)) {
+ if (SMFSource::valid_midi_file (path)) {
boost::shared_ptr<SMFSource> ms =
boost::dynamic_pointer_cast<SMFSource> (
@@ -1326,7 +1326,7 @@ SoundFileOmega::reset_options ()
/* See if we are thinking about importing any MIDI files */
vector<string>::iterator i = paths.begin ();
- while (i != paths.end() && SMFSource::safe_midi_file_extension (*i) == false) {
+ while (i != paths.end() && SMFSource::valid_midi_file (*i) == false) {
++i;
}
bool const have_a_midi_file = (i != paths.end ());
@@ -1554,7 +1554,7 @@ SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool&
src_needed = true;
}
- } else if (SMFSource::safe_midi_file_extension (*i)) {
+ } else if (SMFSource::valid_midi_file (*i)) {
Evoral::SMF reader;
reader.open(*i);
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 4a0fc4b342..ed12184106 100644
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -71,17 +71,19 @@ TranscodeFfmpeg::TranscodeFfmpeg (std::string f)
if (ffmpeg_exe.empty() || ffprobe_exe.empty()) {
warning << string_compose(
_(
- "No ffprobe or ffmpeg executables could be found on this system.\n"
- "Video import and export is not possible until you install those tools.\n"
- "%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
- "\n"
- "The tools are included with the %1 releases from ardour.org "
- "and also available with the video-server at http://x42.github.com/harvid/\n"
- "\n"
- "Important: the files need to be installed in $PATH and named ffmpeg_harvid and ffprobe_harvid.\n"
- "If you already have a suitable ffmpeg installation on your system, we recommend creating "
- "symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n"
- ), PROGRAM_NAME) << endmsg;
+ "No ffprobe or ffmpeg executables could be found on this system.\n"
+ "Video import and export is not possible until you install those tools.\n"
+ "%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+ "\n"
+ "The tools are included with the %1 releases from ardour.org "
+ "and also available with the video-server at http://x42.github.com/harvid/\n"
+ "\n"
+ "Important: the files need to be installed in $PATH and named ffmpeg_harvid and ffprobe_harvid.\n"
+ "If you already have a suitable ffmpeg installation on your system, we recommend creating "
+ "symbolic links from ffmpeg to ffmpeg_harvid and from ffprobe to ffprobe_harvid.\n"
+ "\n"
+ "see also http://manual.ardour.org/video-timeline/setup/"
+ ), PROGRAM_NAME) << endmsg;
return;
}
ffexecok = true;
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 6d9bb22978..add7ea42de 100644
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -123,8 +123,13 @@ VideoServerDialog::VideoServerDialog (Session* s)
else {
PBD::warning <<
string_compose(
- _("The external video server 'harvid' can not be found. The tool is included with the %1 releases from ardour.org, "
- "alternatively you can download it from http://x42.github.com/harvid/ or acquire it from your distribution."), PROGRAM_NAME)
+ _("The external video server 'harvid' can not be found.\n"
+ "The tool is included with the %1 releases from ardour.org, "
+ "alternatively you can download it from http://x42.github.com/harvid/ "
+ "or acquire it from your distribution.\n"
+ "\n"
+ "see also http://manual.ardour.org/video-timeline/setup/"
+ ), PROGRAM_NAME)
<< endmsg;
}
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 0defa56be7..bcbf19d4f7 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -765,7 +765,9 @@ VideoTimeLine::find_xjadeo () {
_xjadeo_bin = X_("");
warning << _("Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
"(a custom path to xjadeo can be specified by setting the XJREMOTE environment variable. "
- "It should point to an application compatible with xjadeo's remote-control interface 'xjremote').")
+ "It should point to an application compatible with xjadeo's remote-control interface 'xjremote').\n"
+ "\n"
+ "see also http://manual.ardour.org/video-timeline/setup/")
<< endmsg;
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 02:15:41 +0000