Changeset 818 for trunk/libs/hydrogen/include/hydrogen/instrument.h

Timestamp:

02/20/09 03:14:31 (4 years ago)

Author:

gabriel@…

Message:

Fix several errors flagged by -Wall

gui/src/FilePreview.cpp
gui/src/FilePreview.h

These files were totally commented out and have been untouched
for over a year. They have been deleted.

libs/hydrogen/include/hydrogen/instrument.h
libs/hydrogen/src/instrument.cpp

Instrument::get_layer() marked inline, so code moved to header to make it inline.
Instrument::Instrument() Triggered a pedantic error about initialization. So,

parameters were rearranged to match the order they were declared.

libs/hydrogen/src/local_file_mgr.cpp

LocalFileMng::saveDrumkit() was not using the pSample local variable.

gui/src/PatternEditor/PianoRollEditor.cpp
gui/src/PatternEditor/PianoRollEditor.h
libs/hydrogen/src/midiMap.cpp
libs/hydrogen/src/sequencer/sequencer.cpp

Add newline to ends of files. (An error on some old compilers.)

Files:

• trunk/libs/hydrogen/include/hydrogen/instrument.h (modified) (3 diffs)

trunk/libs/hydrogen/include/hydrogen/instrument.h

@@ -25 +25 @@
 #define INSTRUMENT_H
 
+#include <QtCore/QString>
 #include <hydrogen/globals.h>
 #include <hydrogen/Object.h>
@@ -127 +128 @@
 
         /// Returns a layer in the list
+        /// See below for definition.
         inline InstrumentLayer* get_layer( int index );
 
@@ -309 +311 @@
 };
 
-
+inline InstrumentLayer* Instrument::get_layer( int nLayer )
+{
+        if ( nLayer < 0 ) {
+                ERRORLOG( QString( "nLayer < 0 (nLayer=%1)" ).arg( nLayer ) );
+                return NULL;
+        }
+        if ( nLayer >= MAX_LAYERS ) {
+                ERRORLOG( QString( "nLayer > MAX_LAYERS (nLayer=%1)" ).arg( nLayer ) );
+                return NULL;
+        }
+
+        return __layer_list[ nLayer ];
+}