From f3c9c99ceb875fac9ab1c35099297f601cef4c12 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Fri, 13 Jun 2008 23:35:04 -0500
Subject: [PATCH] Clean up messages.

---
 src/gui/event_edit.fl | 13 +++++++------
 src/phrase.C          |  2 +-
 src/sequence.C        | 17 +++++++++--------
 src/smf.C             |  6 +++---
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/gui/event_edit.fl b/src/gui/event_edit.fl
index 91ec076..d2862b4 100644
--- a/src/gui/event_edit.fl
+++ b/src/gui/event_edit.fl
@@ -1,5 +1,5 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 1.0107 
+version 1.0108 
 header_name {.H} 
 code_name {.C}
 comment {//
@@ -52,8 +52,8 @@ _el = _old = NULL;
 
 o->hide();
 
-Fl::delete_widget( o );} open selected
-      xywh {704 82 659 803} type Double box DOWN_BOX resizable
+Fl::delete_widget( o );} open
+      xywh {620 82 655 800} type Double box DOWN_BOX resizable
       code0 {\#include "event_edit.H"}
       code1 {\#include "../grid.H"}
       code2 {\#include "../event_list.H"} modal size_range {0 0 659 803} visible
@@ -203,11 +203,12 @@ update_widgets();} {}
   }
   Function {sync( void )} {open return_type void
   } {
-    code {MESSAGE( "syncing events to grid" );
+    code {DMESSAGE( "syncing events to grid" );
 
 _grid->events( _el );
 
-update_widgets();} {}
+update_widgets();} {selected
+    }
   }
   Function {update_widgets( void )} {open return_type void
   } {
@@ -292,7 +293,7 @@ while( w->shown() )
 } 
 
 widget_class Event_Widget {user_data_type {void *} open
-  xywh {969 357 594 31} type Single
+  xywh {685 357 590 30} type Single
   code0 {\#include "../event.H"}
   code1 {_event = NULL;}
   class Fl_Group size_range {400 24 0 24} visible
diff --git a/src/phrase.C b/src/phrase.C
index 69952ef..ecc6b82 100644
--- a/src/phrase.C
+++ b/src/phrase.C
@@ -46,7 +46,7 @@ phrase::phrase ( void )
 
 phrase::~phrase ( void )
 {
-    MESSAGE( "deleting phrase %d", number() );
+    DMESSAGE( "deleting phrase %d", number() );
     signal_create_destroy();
 }
 
diff --git a/src/sequence.C b/src/sequence.C
index 044df7e..87ca64b 100644
--- a/src/sequence.C
+++ b/src/sequence.C
@@ -299,7 +299,7 @@ sequence::load ( const char *name )
 
     f.next_track();
 
-    MESSAGE( "reading song info" );
+    DMESSAGE( "reading song info" );
 
     /* read song info */
 
@@ -324,7 +324,7 @@ sequence::load ( const char *name )
     /* tear it down */
     reset();
 
-    MESSAGE( "reading playlist" );
+    DMESSAGE( "reading playlist" );
 
 //    f.read_playlist( this );
 
@@ -342,7 +342,7 @@ sequence::load ( const char *name )
 
     /* read playlist */
 
-    MESSAGE( "reading phrases" );
+    DMESSAGE( "reading phrases" );
 
     while ( phrases-- && f.next_track() )
     {
@@ -351,7 +351,7 @@ sequence::load ( const char *name )
         p->load( &f );
     }
 
-    MESSAGE( "reading patterns" );
+    DMESSAGE( "reading patterns" );
 
     while ( patterns-- && f.next_track() )
     {
@@ -378,11 +378,11 @@ sequence::save ( const char *name ) const
 
     f.write_header( 2 );
 
-    MESSAGE( "saving playlist" );
+    DMESSAGE( "saving playlist" );
 
     f.open_track( NULL, -1 );
 
-    MESSAGE( "saving song info" );
+    DMESSAGE( "saving song info" );
 
     f.write_song_info( song.play_mode, phrase::phrases(), pattern::patterns(), this->name(), notes() );
 
@@ -399,7 +399,7 @@ sequence::save ( const char *name ) const
 
     f.close_track( 0 );
 
-    MESSAGE( "saving phrases" );
+    DMESSAGE( "saving phrases" );
 
     for ( int i = 0; i < phrase::phrases(); i++ )
     {
@@ -408,7 +408,8 @@ sequence::save ( const char *name ) const
         p->dump( &f );
     }
 
-    MESSAGE( "saving patterns" );
+    DMESSAGE( "saving patterns" );
+
     for ( int i = 0; i < pattern::patterns(); i++ )
     {
         pattern *p = pattern::pattern_by_number( i + 1 );
diff --git a/src/smf.C b/src/smf.C
index 50f0943..e79d3fb 100644
--- a/src/smf.C
+++ b/src/smf.C
@@ -723,7 +723,7 @@ smf::read_phrase_info ( phrase *p )
                 break;
             case smf::NAME:
                 p->name( read_text() );
-                MESSAGE( "Track name: %s", p->name() );
+                DMESSAGE( "Track name: %s", p->name() );
                 break;
             case smf::INSTRUMENT:
                 skip( read_var() );
@@ -805,7 +805,7 @@ smf::read_pattern_info ( pattern *p )
                 break;
             case smf::NAME:
                 p->name( read_text() );
-                MESSAGE( "Track name: %s", p->name() );
+                DMESSAGE( "Track name: %s", p->name() );
                 name_set = true;
                 break;
             case smf::INSTRUMENT:
@@ -1105,7 +1105,7 @@ smf::read_track_events ( tick_t *length )
                             }
                         }
 
-                        MESSAGE( "converting MIDI cue to note-on/off n: %d", e.note() );
+                        DMESSAGE( "converting MIDI cue to note-on/off n: %d", e.note() );
 
                         /* just in case */
                         skip( l );