From 5d49a5d712a74d6635c638896e7f660bcdd023a7 Mon Sep 17 00:00:00 2001 From: VKamyshniy Date: Sun, 25 Jan 2015 13:35:07 +0200 Subject: [PATCH] [Summary] Removing DBG output --- gtk2_ardour/waves_export_dialog.cc | 45 +++++---------------- gtk2_ardour/waves_export_format_selector.cc | 4 +- 2 files changed, 11 insertions(+), 38 deletions(-) diff --git a/gtk2_ardour/waves_export_dialog.cc b/gtk2_ardour/waves_export_dialog.cc index 039fea7432..93fc7529e9 100644 --- a/gtk2_ardour/waves_export_dialog.cc +++ b/gtk2_ardour/waves_export_dialog.cc @@ -102,27 +102,19 @@ WavesExportDialog::set_session (ARDOUR::Session* s) /* Load states */ profile_manager->load_profile (); - /* Tracks does not need anything but Lossless and Lossy */ + + // TRACKS SPECIFIC CONFIGURATION ExportProfileManager::FormatStateList const & formats = profile_manager->get_formats (); - ExportProfileManager::FormatStateList::const_iterator format_it = formats.begin(); - ExportProfileManager::FilenameStateList const & filenames = profile_manager->get_filenames (); - ExportProfileManager::FilenameStateList::const_iterator filename_it = filenames.begin (); - - std::cout << "****************************************************" << std::endl; - std::cout << "****************************************************" << std::endl; - std::cout << "****************************************************" << std::endl; - std::cout << "****************************************************" << std::endl; - for (format_it = formats.begin(), filename_it = filenames.begin(); - format_it != formats.end() && filename_it != filenames.end(); - ++format_it, ++filename_it) { - std::cout << "Format:" << (*format_it)->format->name() << std::endl; - + while (formats.size () > 2) { + profile_manager->remove_format_state (formats.back ()); + profile_manager->remove_filename_state (filenames.back ()); + } + + if (formats.size () == 1) { + profile_manager->duplicate_format_state (formats.front ()), + profile_manager->duplicate_filename_state (filenames.front ()); } - std::cout << "****************************************************" << std::endl; - std::cout << "****************************************************" << std::endl; - std::cout << "****************************************************" << std::endl; - std::cout << "****************************************************" << std::endl; sync_with_manager (); @@ -200,23 +192,6 @@ WavesExportDialog::close_dialog (WavesButton*) status->abort(); } - ExportProfileManager::FormatStateList const & formats = profile_manager->get_formats (); - ExportProfileManager::FormatStateList::const_iterator format_it = formats.begin(); - - ExportProfileManager::FilenameStateList const & filenames = profile_manager->get_filenames (); - ExportProfileManager::FilenameStateList::const_iterator filename_it = filenames.begin (); - std::cout << "----------------------------------------------------" << std::endl; - std::cout << "----------------------------------------------------" << std::endl; - std::cout << "----------------------------------------------------" << std::endl; - for (format_it = formats.begin(), filename_it = filenames.begin(); - format_it != formats.end() && filename_it != filenames.end(); - ++format_it, ++filename_it) { - std::cout << "Format:" << (*format_it)->format->name() << std::endl; - - } - std::cout << "----------------------------------------------------" << std::endl; - std::cout << "----------------------------------------------------" << std::endl; - std::cout << "----------------------------------------------------" << std::endl; response (Gtk::RESPONSE_CANCEL); } diff --git a/gtk2_ardour/waves_export_format_selector.cc b/gtk2_ardour/waves_export_format_selector.cc index ea4f958597..03f158f312 100644 --- a/gtk2_ardour/waves_export_format_selector.cc +++ b/gtk2_ardour/waves_export_format_selector.cc @@ -27,7 +27,7 @@ #include "i18n.h" WavesExportFormatSelector::WavesExportFormatSelector () - : Gtk::HBox () + : Gtk::VBox () , WavesUI ("waves_export_format_selector.xml", *this) , _edit_button (get_waves_button ("edit_button")) , _remove_button (get_waves_button ("remove_button")) @@ -186,14 +186,12 @@ WavesExportFormatSelector::open_edit_dialog (bool new_dialog) void WavesExportFormatSelector::update_format_dropdown (WavesDropdown*, int item) { - std::cout << "WavesExportFormatSelector::update_format_dropdown ()" << std::endl; Gtk::TreeModel::Children::iterator it; bool done = false; for (it = format_list->children().begin(); it != format_list->children().end(); ++it) { FormatPtr format = it->get_value (format_cols.format); if ((void*)format.get () == _format_dropdown.get_item_associated_data(item)) { state->format = format; - std::cout << " Changed format to " << format->name () << std::endl; done = true; break; }