Changeset 818 for trunk/libs/hydrogen/src/instrument.cpp

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/src/instrument.cpp (modified) (2 diffs)

trunk/libs/hydrogen/src/instrument.cpp

@@ -41 +41 @@
                 , __muted( false )
                 , __name( name )
+                , __pan_l( 1.0 )
+                , __pan_r( 1.0 )
+                , __gain( 1.0 )
                 , __volume( 1.0 )
                 , __filter_resonance( 0.0 )
                 , __filter_cutoff( 1.0 )
+                , __peak_l( 0.0 )
+                , __peak_r( 0.0 )
                 , __random_pitch_factor( 0.0 )
                 , __id( id )
+                , __drumkit_name( "" )
                 , __filter_active( false )
-                , __pan_l( 1.0 )
-                , __pan_r( 1.0 )
+                , __mute_group( -1 )
+                , __active( true )
                 , __soloed( false )
-                , __active( true )
-                , __peak_l( 0.0 )
-                , __peak_r( 0.0 )
-                , __gain( 1.0 )
-                , __drumkit_name( "" )
-                , __mute_group( -1 )
                 , __stop_notes( false )
 {
@@ -77 +77 @@
         delete __adsr;
         __adsr = NULL;
-}
-
-
-
-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 ];
 }