diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-22 12:57:05 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-22 12:57:05 +0000 |
commit | 8d5065bc32b5d54049d8458cc14732c659fdb77f (patch) | |
tree | 4c2825391f2692ad90dca08e30105551020474cc /gtk2_ardour | |
parent | fa1e12b682e66ef6eb30de9aaad7ac919eb10634 (diff) |
remove, convert, comment several cerr statements
git-svn-id: svn://localhost/ardour2/branches/3.0@12378 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/actions.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/audio_time_axis.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/editor_canvas.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/editor_mouse.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 5 | ||||
-rw-r--r-- | gtk2_ardour/editor_route_groups.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/editor_selection.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/keyeditor.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/midi_region_view.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/missing_file_dialog.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/startup.cc | 4 |
15 files changed, 5 insertions, 32 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index a1bdcdb36e..0db4831e6f 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -157,11 +157,7 @@ ActionManager::map_some_state (const char* group, const char* action, bool (RCCo if (tact->get_active() != x) { tact->set_active (x); } - } else { - cerr << group << ':' << action << " is not a toggle\n"; } - } else { - cerr << group << ':' << action << " not an action\n"; } } diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 8063164eb5..d54ae5e291 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1162,7 +1162,6 @@ ARDOUR_UI::redisplay_recent_sessions () /* check whether session still exists */ if (!Glib::file_test(fullpath.c_str(), Glib::FILE_TEST_EXISTS)) { /* session doesn't exist */ - cerr << "skipping non-existent session " << fullpath << endl; continue; } @@ -2839,7 +2838,6 @@ ARDOUR_UI::show_splash () try { splash = new Splash; } catch (...) { - cerr << "Splash could not be created\n"; return; } } diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index eca908eeb4..a34d6421a2 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -179,7 +179,6 @@ void AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) { if (param.type() == NullAutomation) { - cerr << "WARNING: Attempt to create NullAutomation child, ignoring" << endl; return; } diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 3332a066d9..e0d53e1707 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -442,8 +442,6 @@ AutomationTimeAxisView::set_height (uint32_t h) auto_button.hide(); hide_button.hide(); } - } else if (h >= preset_height (HeightNormal)) { - cerr << "track grown, but neither changed_between_small_and_normal nor first_call_to_set_height set!" << endl; } if (changed) { diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index bf70e6ac7d..0ba5f4054c 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -786,7 +786,6 @@ Editor::button_settings () const XMLNode* node = find_named_node (*settings, X_("Buttons")); if (!node) { - cerr << "new empty Button node\n"; node = new XMLNode (X_("Buttons")); } diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 76b41280c2..9e43fcc35c 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -732,7 +732,7 @@ Editor::left_track_canvas (GdkEventCrossing */*ev*/) { DropDownKeys (); within_track_canvas = false; - cerr << "left track canvas\n"; + //cerr << "left track canvas\n"; set_entered_track (0); set_entered_regionview (0); reset_canvas_action_sensitivity (false); @@ -742,7 +742,7 @@ Editor::left_track_canvas (GdkEventCrossing */*ev*/) bool Editor::entered_track_canvas (GdkEventCrossing */*ev*/) { - cerr << "entered track canvas\n"; + //cerr << "entered track canvas\n"; within_track_canvas = true; reset_canvas_action_sensitivity (true); return FALSE; diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index d7d1c34280..7f4445652a 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -2430,10 +2430,6 @@ Editor::point_trim (GdkEvent* event, framepos_t new_bound) for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) { - if ( (*i) == NULL){ - cerr << "region view contains null region" << endl; - } - if (!(*i)->region()->locked()) { (*i)->region()->clear_changes (); (*i)->region()->trim_front (new_bound); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index a8f1d1f6d7..d6cae9a8e2 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -3202,15 +3202,10 @@ Editor::trim_region (bool front) framepos_t where = get_preferred_edit_position(); RegionSelection rs = get_regions_from_selection_and_edit_point (); - cerr << "trim regions\n"; - if (rs.empty()) { - cerr << " no regions\n"; return; } - cerr << "where = " << where << endl; - begin_reversible_command (front ? _("trim front") : _("trim back")); for (list<RegionView*>::const_iterator i = rs.by_layer().begin(); i != rs.by_layer().end(); ++i) { diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 2fd08e7609..ba170a680d 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -367,7 +367,6 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev) case 12: val = (*iter)[_columns.active_shared]; - cerr << "set group active to " << !val << endl; group->set_route_active (!val); ret = true; break; diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 20ab6673a8..8e2b668375 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -264,7 +264,6 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op) case Selection::Extend: selection->clear(); - cerr << ("Editor::set_selected_track_as_side_effect case Selection::Add not yet implemented\n"); break; } } diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index 0d2cd98942..055a9bcae0 100644 --- a/gtk2_ardour/keyeditor.cc +++ b/gtk2_ardour/keyeditor.cc @@ -109,8 +109,6 @@ KeyEditor::unbind () unbind_button.set_sensitive (false); - cerr << "trying to unbind\n"; - if (i != model->children().end()) { string path = (*i)[columns.path]; diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 76db1a7b69..142b6c6988 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -2909,7 +2909,7 @@ MidiRegionView::change_note_lengths (bool fine, bool shorter, Evoral::MusicalTim delta = trackview.editor().get_grid_type_as_beats (success, _region->position()); if (!success) { /* XXX cannot get grid type as beats ... should always be possible ... FIX ME */ - cerr << "Grid type not available as beats - TO BE FIXED\n"; + error << string_compose (_("programming error: %1"), "Grid type not available as beats - TO BE FIXED") << endmsg; return; } } diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 3bd67af9a0..f38913fe31 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -861,7 +861,6 @@ void MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool show) { if (param.type() == NullAutomation) { - cerr << "WARNING: Attempt to create NullAutomation child, ignoring" << endl; return; } @@ -874,8 +873,6 @@ MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool * since it will have been set visible by default. */ - cerr << "show existing auto track: " << show << " noredraw " << no_redraw << endl; - if (existing->second->set_marked_for_display (show) && !no_redraw) { request_redraw (); } diff --git a/gtk2_ardour/missing_file_dialog.cc b/gtk2_ardour/missing_file_dialog.cc index 66085217d2..54b20b547b 100644 --- a/gtk2_ardour/missing_file_dialog.cc +++ b/gtk2_ardour/missing_file_dialog.cc @@ -59,7 +59,6 @@ MissingFileDialog::MissingFileDialog (Session* s, const std::string& path, DataT string dirstr; dirstr = s->source_search_path (type); - cerr << "Search path = " << dirstr << endl; replace_all (dirstr, ":", "\n"); msg.set_justify (JUSTIFY_CENTER); diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index 483512e8cd..1c0ddfa6b4 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -715,7 +715,7 @@ ArdourStartup::populate_session_templates () static bool lost_name_entry_focus (GdkEventFocus*) { - cerr << "lost focus\n"; + // cerr << "lost focus\n"; return false; } @@ -891,7 +891,7 @@ ArdourStartup::setup_new_session_page () void ArdourStartup::new_name_mapped () { - cerr << "Grab new name focus\n"; + // cerr << "Grab new name focus\n"; new_name_entry.grab_focus (); } |