From c713db6f3475bb07add27bcad61a292bd1dcfa40 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Mon, 1 Feb 2010 00:23:01 -0600
Subject: [PATCH] Mixer: Clean up some compiler warnings.

---
 Mixer/Chain.C                   | 2 +-
 Mixer/Chain.H                   | 2 +-
 Mixer/JACK_Module.C             | 2 +-
 Mixer/LADSPAInfo.C              | 4 ++--
 Mixer/Mixer_Strip.C             | 7 +------
 Mixer/Module_Parameter_Editor.C | 2 +-
 Mixer/Plugin_Module.C           | 2 +-
 Mixer/main.C                    | 2 +-
 8 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Mixer/Chain.C b/Mixer/Chain.C
index 8a33b32..fa630a0 100644
--- a/Mixer/Chain.C
+++ b/Mixer/Chain.C
@@ -400,7 +400,7 @@ Chain::can_configure_outputs ( Module *m, int n ) const
     return true;
 }
 
-int
+unsigned int
 Chain::maximum_name_length ( void )
 {
     return JACK::Client::maximum_name_length() - ( strlen( APP_NAME ) + 1 + ( instance_name ? strlen( instance_name ) + 1 : 0 ) );
diff --git a/Mixer/Chain.H b/Mixer/Chain.H
index 80917d3..b28df80 100644
--- a/Mixer/Chain.H
+++ b/Mixer/Chain.H
@@ -116,7 +116,7 @@ public:
 
     void log_children ( void );
 
-    static int maximum_name_length ( void );
+    static unsigned int maximum_name_length ( void );
 
     Engine *engine ( void ) const { return _engine; }
 
diff --git a/Mixer/JACK_Module.C b/Mixer/JACK_Module.C
index f0e44f2..949d331 100644
--- a/Mixer/JACK_Module.C
+++ b/Mixer/JACK_Module.C
@@ -77,7 +77,7 @@ JACK_Module::~JACK_Module ( )
 
 
 int
-JACK_Module::can_support_inputs ( int n )
+JACK_Module::can_support_inputs ( int )
 {
     return audio_output.size();
 }
diff --git a/Mixer/LADSPAInfo.C b/Mixer/LADSPAInfo.C
index cbc5a46..c3a6d6c 100644
--- a/Mixer/LADSPAInfo.C
+++ b/Mixer/LADSPAInfo.C
@@ -682,7 +682,7 @@ LADSPAInfo::MetadataRDFDescend(const char * uri,
 	// Add any instances found
 		lrdf_uris * instances = lrdf_get_instances(uri);
 		if (instances) {
-			for (long j = 0; j < instances->count; j++) {
+			for (unsigned long j = 0; j < instances->count; j++) {
 				unsigned long uid = lrdf_get_uid(instances->items[j]);
 				if (m_IDLookup.find(uid) != m_IDLookup.end()) {
 					ri.Plugins.push_back(m_IDLookup[uid]);
@@ -713,7 +713,7 @@ LADSPAInfo::MetadataRDFDescend(const char * uri,
 	lrdf_uris * uris = lrdf_get_subclasses(uri);
 
 	if (uris) {
-		for (long i = 0; i < uris->count; i++) {
+		for (unsigned long i = 0; i < uris->count; i++) {
 			MetadataRDFDescend(uris->items[i], this_uri_index);
 		}
 	}
diff --git a/Mixer/Mixer_Strip.C b/Mixer/Mixer_Strip.C
index bf96d56..c8d2e5e 100644
--- a/Mixer/Mixer_Strip.C
+++ b/Mixer/Mixer_Strip.C
@@ -258,7 +258,7 @@ Mixer_Strip::name ( const char *name ) {
 }
 
 void
-Mixer_Strip::configure_outputs ( Fl_Widget *o, void *v )
+Mixer_Strip::configure_outputs ( Fl_Widget *, void *v )
 {
     ((Mixer_Strip*)v)->configure_outputs();
 }
@@ -317,8 +317,6 @@ Mixer_Strip::init ( )
     set_visible_focus();
     clip_children( 1 );
 
-    Fl_Pack *gain_pack;
-
     { Fl_Pack *o = new Fl_Pack( 2, 2, 114, 100 );
         o->type( Fl_Pack::VERTICAL );
         o->spacing( 2 );
@@ -379,9 +377,6 @@ Mixer_Strip::init ( )
             o->callback( cb_handle, this );
             o->when(FL_WHEN_RELEASE);
         }
-//    { Fl_Pack* o = new Fl_Pack(8, 208, 103, 471);
-//    { Fl_Pack* o = gain_pack = new Fl_Pack(8, 208, 103, 516 );
-
         o->end();
     }
 
diff --git a/Mixer/Module_Parameter_Editor.C b/Mixer/Module_Parameter_Editor.C
index 2540e97..08a8b5c 100644
--- a/Mixer/Module_Parameter_Editor.C
+++ b/Mixer/Module_Parameter_Editor.C
@@ -268,7 +268,7 @@ Module_Parameter_Editor::cb_value_handle ( Fl_Widget *w, void *v )
 }
 
 void
-Module_Parameter_Editor::cb_mode_handle ( Fl_Widget *w, void *v )
+Module_Parameter_Editor::cb_mode_handle ( Fl_Widget *, void *v )
 {
     ((Module_Parameter_Editor*)v)->make_controls();
 }
diff --git a/Mixer/Plugin_Module.C b/Mixer/Plugin_Module.C
index 65f9cf7..8281bf8 100644
--- a/Mixer/Plugin_Module.C
+++ b/Mixer/Plugin_Module.C
@@ -265,7 +265,7 @@ Plugin_Module::configure_inputs( int n )
 }
 
 void *
-Plugin_Module::discover_thread ( void * v )
+Plugin_Module::discover_thread ( void * )
 {
     THREAD_ASSERT( Plugin_Discover );
 
diff --git a/Mixer/main.C b/Mixer/main.C
index 40d6471..a43e06a 100644
--- a/Mixer/main.C
+++ b/Mixer/main.C
@@ -75,7 +75,7 @@ ensure_dirs ( void )
 
 #include <signal.h>
 
-static void cb_main ( Fl_Double_Window *o, void *v )
+static void cb_main ( Fl_Double_Window *o, void *)
 {
     if ( Fl::event_key() != FL_Escape )
         o->hide();