From f0dbd6c0855e76a87d97a1774f2e97a5b9211ae6 Mon Sep 17 00:00:00 2001 From: Colin Fletcher Date: Tue, 27 May 2014 11:23:47 +0100 Subject: Export dialog: tidy code, & remove some superfluous debug output Remove some debug output, tidy up a few whitespace inconsistencies, use DEBUG::Soundcloud in one more place, and zap a couple of unused variables. --- gtk2_ardour/soundcloud_export_selector.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gtk2_ardour/soundcloud_export_selector.cc') diff --git a/gtk2_ardour/soundcloud_export_selector.cc b/gtk2_ardour/soundcloud_export_selector.cc index ab1f1a63c8..8ecdf5d49b 100644 --- a/gtk2_ardour/soundcloud_export_selector.cc +++ b/gtk2_ardour/soundcloud_export_selector.cc @@ -20,6 +20,7 @@ *************************************************************************************/ +#include "ardour/debug.h" #include "ardour/soundcloud_upload.h" #include "soundcloud_export_selector.h" @@ -38,7 +39,7 @@ using namespace PBD; #include "ardour/session_metadata.h" #include "utils.h" -SoundcloudExportSelector::SoundcloudExportSelector() : +SoundcloudExportSelector::SoundcloudExportSelector () : sc_table (4, 3), soundcloud_username_label (_("User Email"), 1.0, 0.5), soundcloud_password_label (_("Password"), 1.0, 0.5), @@ -57,20 +58,19 @@ SoundcloudExportSelector::SoundcloudExportSelector() : soundcloud_password_entry.set_name ("ExportFormatDisplay"); soundcloud_username_entry.set_text (ARDOUR::SessionMetadata::Metadata()->user_email()); - soundcloud_password_entry.set_visibility(false); + soundcloud_password_entry.set_visibility (false); - Gtk::Frame *sc_frame = manage(new Gtk::Frame); - sc_frame->set_border_width(4); - sc_frame->set_shadow_type(Gtk::SHADOW_ETCHED_OUT); - sc_frame->set_name("soundcloud_export_box"); - pack_start(*sc_frame, false, false); + Gtk::Frame *sc_frame = manage (new Gtk::Frame); + sc_frame->set_border_width (4); + sc_frame->set_shadow_type (Gtk::SHADOW_ETCHED_OUT); + sc_frame->set_name ("soundcloud_export_box"); + pack_start (*sc_frame, false, false); sc_table.set_border_width (4); sc_table.set_col_spacings (5); sc_table.set_row_spacings (5); sc_frame->add (sc_table); - // sc_table.attach ( *( manage (new EventBox (::get_icon (X_("soundcloud"))))) , 0, 1, 0, 1); sc_table.attach ( *(Gtk::manage (new Gtk::Image (get_icon (X_("soundcloud"))))) , 0, 1, 0, 2); sc_table.attach (soundcloud_username_label, 0, 1, 1, 2); @@ -81,15 +81,15 @@ SoundcloudExportSelector::SoundcloudExportSelector() : sc_table.attach (soundcloud_open_checkbox, 2, 3, 4, 5); sc_table.attach (soundcloud_download_checkbox, 2, 3, 5, 6); - pack_end(progress_bar, false, false); - sc_frame->show_all(); + pack_end (progress_bar, false, false); + sc_frame->show_all (); } int -SoundcloudExportSelector::do_progress_callback(double ultotal, double ulnow, const std::string &filename) +SoundcloudExportSelector::do_progress_callback (double ultotal, double ulnow, const std::string &filename) { - std::cerr << "SoundcloudExportSelector::do_progress_callback(" << ultotal << ", " << ulnow << ", " << filename << ")..." << std::endl; + DEBUG_TRACE (DEBUG::Soundcloud, string_compose ("SoundcloudExportSelector::do_progress_callback(%1, %2, %3)", ultotal, ulnow, filename)); if (soundcloud_cancel) { progress_bar.set_fraction (0); // cancel_button.set_label (""); @@ -105,7 +105,7 @@ SoundcloudExportSelector::do_progress_callback(double ultotal, double ulnow, con std::string prog; prog = string_compose (_("%1: %2 of %3 bytes uploaded"), filename, ulnow, ultotal); - progress_bar.set_text( prog ); + progress_bar.set_text (prog); return 0; -- cgit v1.2.3