From 84938f31cfe603cbeb1c38c0898f50a91cdc5b63 Mon Sep 17 00:00:00 2001 From: Damien Zammit Date: Sun, 9 Aug 2015 01:42:22 +1000 Subject: Fix more warnings Signed-off-by: Damien Zammit --- gtk2_ardour/editor_pt_import.cc | 4 ++-- libs/ptformat/ptfformat.cc | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_pt_import.cc b/gtk2_ardour/editor_pt_import.cc index 17c46be244..15723c3b27 100644 --- a/gtk2_ardour/editor_pt_import.cc +++ b/gtk2_ardour/editor_pt_import.cc @@ -132,7 +132,7 @@ Editor::do_ptimport (std::string ptpath, msg.run (); return; } else { - MessageDialog msg (string_compose (_("PT v%1 Session @ %2Hz\n\n%3 audio files\n%4 regions\n%5 active regions\n\nContinue..."), (int)(ptf.version+0), ptf.sessionrate, ptf.audiofiles.size(), ptf.regions.size(), ptf.tracks.size())); + MessageDialog msg (string_compose (_("PT v%1 Session @ %2Hz\n\n%3 audio files\n%4 regions\n%5 active regions\n\nContinue..."), (int)ptf.version, ptf.sessionrate, ptf.audiofiles.size(), ptf.regions.size(), ptf.tracks.size())); msg.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); int result = msg.run (); @@ -213,7 +213,7 @@ Editor::do_ptimport (std::string ptpath, for (vector::iterator p = ptfregpair.begin(); p != ptfregpair.end(); ++p) { - if ((p->index1 == a->reg.index)) { + if (p->index1 == a->reg.index) { // Matched a ptf active region to an ardour region utr.index1 = a->index; utr.index2 = nth; diff --git a/libs/ptformat/ptfformat.cc b/libs/ptformat/ptfformat.cc index 21c6dcaae7..97a18c1fd5 100644 --- a/libs/ptformat/ptfformat.cc +++ b/libs/ptformat/ptfformat.cc @@ -796,6 +796,7 @@ PTFFormat::parserest89(void) { uint8_t somethingbytes = 0; uint8_t skipbytes = 0; + k = 0; while (k < len) { if ( (ptfunxored[k ] == 'S') && (ptfunxored[k+1] == 'n') && @@ -1044,6 +1045,7 @@ PTFFormat::parserest10(void) { uint8_t somethingbytes = 0; uint8_t skipbytes = 0; + k = 0; while (k < len) { if ( (ptfunxored[k ] == 'S') && (ptfunxored[k+1] == 'n') && -- cgit v1.2.3