summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk2_ardour/ardour_ui.cc2
-rw-r--r--gtk2_ardour/audio_region_view.cc8
-rw-r--r--gtk2_ardour/editor.cc6
-rw-r--r--gtk2_ardour/editor_drag.cc2
-rw-r--r--gtk2_ardour/editor_ops.cc2
-rw-r--r--gtk2_ardour/engine_dialog.cc5
-rw-r--r--gtk2_ardour/main.cc2
-rw-r--r--gtk2_ardour/patch_change_dialog.cc3
-rw-r--r--gtk2_ardour/processor_box.cc2
-rw-r--r--gtk2_ardour/session_metadata_dialog.cc10
-rw-r--r--gtk2_ardour/sfdb_freesound_mootcher.cc18
-rw-r--r--gtk2_ardour/sfdb_ui.cc8
-rw-r--r--gtk2_ardour/utils.cc2
13 files changed, 24 insertions, 46 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 4fb5375321..a9e6a7d1b5 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -401,7 +401,7 @@ ARDOUR_UI::post_engine ()
vector<string>::iterator n;
vector<string>::iterator k;
for (n = names.begin(), k = keys.begin(); n != names.end(); ++n, ++k) {
- cerr << "Action: " << (*n) << " bound to " << (*k) << endl;
+ cout << "Action: " << (*n) << " bound to " << (*k) << endl;
}
exit (0);
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 4b0de7d725..8f3c87b00d 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -268,7 +268,6 @@ void
AudioRegionView::region_changed (const PropertyChange& what_changed)
{
ENSURE_GUI_THREAD (*this, &AudioRegionView::region_changed, what_changed);
- cerr << "AudioRegionView::region_changed() called" << endl;
RegionView::region_changed (what_changed);
@@ -276,28 +275,21 @@ AudioRegionView::region_changed (const PropertyChange& what_changed)
region_scale_amplitude_changed ();
}
if (what_changed.contains (ARDOUR::Properties::fade_in)) {
- cerr << region()->name() << " in changed\n";
- stacktrace (cerr, 40);
fade_in_changed ();
}
if (what_changed.contains (ARDOUR::Properties::fade_out)) {
- cerr << region()->name() << " out changed\n";
fade_out_changed ();
}
if (what_changed.contains (ARDOUR::Properties::fade_in_active)) {
- cerr << region()->name() << " in active changed\n";
fade_in_active_changed ();
}
if (what_changed.contains (ARDOUR::Properties::fade_out_active)) {
- cerr << region()->name() << " out active changed\n";
fade_out_active_changed ();
}
if (what_changed.contains (ARDOUR::Properties::fade_in_is_xfade)) {
- cerr << region()->name() << " in is xfade changed\n";
fade_in_changed ();
}
if (what_changed.contains (ARDOUR::Properties::fade_out_is_xfade)) {
- cerr << region()->name() << " out is xfade changed\n";
fade_out_changed ();
}
if (what_changed.contains (ARDOUR::Properties::envelope_active)) {
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index d07ac8794a..da713ec072 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -208,12 +208,6 @@ static const gchar *_rb_opt_strings[] = {
};
#endif
-void
-show_me_the_size (Requisition* r, const char* what)
-{
- cerr << "size of " << what << " = " << r->width << " x " << r->height << endl;
-}
-
static void
pane_size_watcher (Paned* pane)
{
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 42af2bb9fc..eeb706376c 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3718,7 +3718,7 @@ RangeMarkerBarDrag::motion (GdkEvent* event, bool first_move)
crect = _editor->cd_marker_bar_drag_rect;
break;
default:
- cerr << "Error: unknown range marker op passed to Editor::drag_range_markerbar_op ()" << endl;
+ error << string_compose (_("programming_error: %1"), "Error: unknown range marker op passed to Editor::drag_range_markerbar_op ()") << endmsg;
return;
break;
}
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index ac402981a8..5e2e2081b4 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4746,8 +4746,6 @@ Editor::insert_patch_change (bool from_context)
const framepos_t p = get_preferred_edit_position (false, from_context);
- cerr << "Got " << rs.size() << " regions to add patch change to\n";
-
/* XXX: bit of a hack; use the MIDNAM from the first selected region;
there may be more than one, but the PatchChangeDialog can only offer
one set of patch menus.
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index f0121f5f42..00a82aecde 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -641,12 +641,11 @@ EngineControl::setup_engine ()
error << string_compose (_("cannot open JACK rc file %1 to store parameters"), jackdrc_path) << endmsg;
return -1;
}
- cerr << "JACK COMMAND: ";
+
for (vector<string>::iterator i = args.begin(); i != args.end(); ++i) {
- cerr << (*i) << ' ';
jackdrc << (*i) << ' ';
}
- cerr << endl;
+
jackdrc << endl;
jackdrc.close ();
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 8b700b59b4..cebef59f26 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -428,7 +428,7 @@ int main (int argc, char *argv[])
if (no_splash) {
cerr << _("Copyright (C) 1999-2012 Paul Davis") << endl
- << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl
+ << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker, Robin Gareus") << endl
<< endl
<< string_compose (_("%1 comes with ABSOLUTELY NO WARRANTY"), PROGRAM_NAME) << endl
<< _("not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") << endl
diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc
index 07e9d96385..a7fc024a8f 100644
--- a/gtk2_ardour/patch_change_dialog.cc
+++ b/gtk2_ardour/patch_change_dialog.cc
@@ -305,10 +305,9 @@ PatchChangeDialog::patch_combo_changed ()
for (MIDI::Name::PatchBank::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
string n = (*j)->name ();
boost::replace_all (n, "_", " ");
- std::cerr << "Looking for " << n << " vs " << _patch_combo.get_active_text() << std::endl;
+
if (n == _patch_combo.get_active_text ()) {
_ignore_signals = true;
- std::cerr << " reset pgm number to " << (int) (*j)->program_number() << std::endl;
_program.set_value ((*j)->program_number() + 1);
_ignore_signals = false;
break;
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 2cb561172e..70e479363e 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -1893,7 +1893,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
}
catch (...) {
- cerr << "plugin insert constructor failed\n";
+ error << _("plugin insert constructor failed") << endmsg;
}
}
diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc
index 1184a89cf5..67d04faa9e 100644
--- a/gtk2_ardour/session_metadata_dialog.cc
+++ b/gtk2_ardour/session_metadata_dialog.cc
@@ -24,6 +24,7 @@
#include <gtkmm2ext/utils.h>
#include "pbd/xml++.h"
+#include "pbd/error.h"
#include "ardour/session.h"
#include "ardour/session_utils.h"
@@ -32,6 +33,7 @@
using namespace std;
using namespace Glib;
+using namespace PBD;
#define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember))
@@ -326,7 +328,7 @@ void
SessionMetadataSetImportable::load_extra_data (ARDOUR::SessionMetadata const & data)
{
if (!_session) {
- std::cerr << "Programming error: no session set for SessionMetaDataSetImportable (in load_data)!" << std::endl;
+ error << string_compose (_("programming error: %1"), "no session set for SessionMetaDataSetImportable (in load_data)!") << endmsg;
return;
}
@@ -374,7 +376,7 @@ void
SessionMetadataSetImportable::save_data ()
{
if (!_session) {
- std::cerr << "Programming error: no session set for SessionMetaDataSetImportable (in import_data)!" << std::endl;
+ error << string_compose (_("programming error: %1"), "no session set for SessionMetaDataSetImportable (in import_data)!") << endmsg;
return;
}
@@ -430,7 +432,7 @@ void
SessionMetadataDialog<DataSet>::init_data ( bool skip_user )
{
if (!_session) {
- std::cerr << "Programming error: no session set for SessionMetaDataDialog (in init_data)!" << std::endl;
+ error << string_compose (_("programming error: %1"), "no session set for SessionMetaDataDialog (in init_data)!") << endmsg;
return;
}
@@ -711,7 +713,7 @@ void
SessionMetadataImporter::run ()
{
if (!_session) {
- std::cerr << "Programming error: no session set for SessionMetaDataImporter (in run)!" << std::endl;
+ error << string_compose (_("programming error: %1"), "no session set for SessionMetaDataImporter (in run)!") << endmsg;
return;
}
diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc
index b0a4d90339..a1cb4a969e 100644
--- a/gtk2_ardour/sfdb_freesound_mootcher.cc
+++ b/gtk2_ardour/sfdb_freesound_mootcher.cc
@@ -54,10 +54,11 @@
#include "ardour/audio_library.h"
+using namespace PBD;
+
static const std::string base_url = "http://www.freesound.org/api";
static const std::string api_key = "9d77cb8d841b4bcfa960e1aae62224eb"; // ardour3
-
//------------------------------------------------------------------------
Mootcher::Mootcher()
: curl(curl_easy_init())
@@ -180,12 +181,11 @@ std::string Mootcher::doRequest(std::string uri, std::string params)
}
curl_easy_setopt(curl, CURLOPT_URL, url.c_str() );
- std::cerr << "doRequest: " << url << std::endl;
// perform online request
CURLcode res = curl_easy_perform(curl);
if( res != 0 ) {
- std::cerr << "curl error " << res << " (" << curl_easy_strerror(res) << ")" << std::endl;
+ error << string_compose (_("curl error %1 (%2)"), res, curl_easy_strerror(res)) << endmsg;
return "";
}
@@ -235,8 +235,6 @@ std::string Mootcher::getSoundResourceFile(std::string ID)
std::string xml;
- std::cerr << "getSoundResourceFile(" << ID << ")" << std::endl;
-
// download the xmlfile into xml_page
xml = doRequest("/sounds/" + ID, "");
@@ -246,12 +244,12 @@ std::string Mootcher::getSoundResourceFile(std::string ID)
// if the page is not a valid xml document with a 'freesound' root
if (freesound == NULL) {
- std::cerr << "getSoundResourceFile: There is no valid root in the xml file" << std::endl;
+ error << _("getSoundResourceFile: There is no valid root in the xml file") << endmsg;
return "";
}
if (strcmp(doc.root()->name().c_str(), "response") != 0) {
- std::cerr << "getSoundResourceFile: root =" << doc.root()->name() << ", != response" << std::endl;
+ error << string_compose (_("getSoundResourceFile: root = %1, != response"), doc.root()->name()) << endmsg;
return "";
}
@@ -302,7 +300,6 @@ std::string Mootcher::getAudioFile(std::string originalFileName, std::string ID,
if (testFile) {
fseek (testFile , 0 , SEEK_END);
if (ftell (testFile) > 256) {
- std::cerr << "audio file " << audioFileName << " already exists" << std::endl;
fclose (testFile);
return audioFileName;
}
@@ -337,7 +334,6 @@ std::string Mootcher::getAudioFile(std::string originalFileName, std::string ID,
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, audioFileWrite);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, theFile);
- std::cerr << "downloading " << audioFileName << " from " << audioURL << "..." << std::endl;
/* hack to get rid of the barber-pole stripes */
caller->freesound_progress_bar.hide();
caller->freesound_progress_bar.show();
@@ -358,11 +354,10 @@ std::string Mootcher::getAudioFile(std::string originalFileName, std::string ID,
caller->freesound_progress_bar.set_text("");
if( res != 0 ) {
- std::cerr << "curl error " << res << " (" << curl_easy_strerror(res) << ")" << std::endl;
+ error << string_compose (_("curl error %1 (%2)"), res, curl_easy_strerror(res)) << endmsg;
remove( audioFileName.c_str() );
return "";
} else {
- std::cerr << "done!" << std::endl;
// now download the tags &c.
getSoundResourceFile(ID);
}
@@ -387,7 +382,6 @@ SoundFileBrowser *sfb = (SoundFileBrowser *) caller;
while (Glib::MainContext::get_default()->iteration (false)) {
/* do nothing */
}
- std::cerr << "progress: " << dlnow << " of " << dltotal << " \r";
return 0;
}
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index eab34a6a0a..42d304e8f4 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -862,19 +862,19 @@ SoundFileBrowser::freesound_search()
XMLNode *root = doc.root();
if (!root) {
- cerr << "no root XML node!" << endl;
+ error << "no root XML node!" << endmsg;
break;
}
if ( strcmp(root->name().c_str(), "response") != 0) {
- cerr << "root node name == " << root->name() << ", != \"response\"!" << endl;
+ error << string_compose ("root node name == %1 != \"response\"", root->name()) << endmsg;
break;
}
XMLNode *sounds_root = root->child("sounds");
if (!sounds_root) {
- cerr << "no child node \"sounds\" found!" << endl;
+ error << "no child node \"sounds\" found!" << endmsg;
break;
}
@@ -884,7 +884,7 @@ SoundFileBrowser::freesound_search()
for (niter = sounds.begin(); niter != sounds.end(); ++niter) {
node = *niter;
if( strcmp( node->name().c_str(), "resource") != 0 ){
- cerr << "node->name()=" << node->name() << ",!= \"resource\"!" << endl;
+ error << string_compose ("node->name()=%1 != \"resource\"", node->name()) << endmsg;
freesound_search_cancel = true;
break;
}
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index d383758002..7771aea650 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -549,7 +549,7 @@ get_icon (const char* cname)
} catch (const Gdk::PixbufError &e) {
cerr << "Caught PixbufError: " << e.what() << endl;
} catch (...) {
- g_message("Caught ... ");
+ error << string_compose (_("Caught exception while loading icon named %1"), cname) << endmsg;
}
return img;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-27 12:15:02 +0000