mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a mismerge that caused meter indicators not to be updated.

This commit is contained in:
Jonathan Moore Liles 2010-02-02 17:55:58 -06:00
parent 83e51b2f20
commit 7a702eefb8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mixer/src/Meter_Indicator_Module.C
View File

@ -257,13 +257,15 @@ Meter_Indicator_Module::handle_control_changed ( Port *p )
/**********/ /**********/
void void
Meter_Indicator_Module::process ( void ) Meter_Indicator_Module::process ( nframes_t )
{ {
if ( control_input[0].connected() ) if ( control_input[0].connected() )
{ {
Port *p = control_input[0].connected_port(); Port *p = control_input[0].connected_port();
for ( int i = 0; i < p->hints.dimensions; ++i ) for ( int i = 0; i < p->hints.dimensions; ++i )
{
control_value[i] = ((float*)control_input[0].buffer())[i]; control_value[i] = ((float*)control_input[0].buffer())[i];
} }
} }
}

5
mixer/src/Meter_Indicator_Module.H
View File

@ -58,16 +58,13 @@ public:
LOG_CREATE_FUNC( Meter_Indicator_Module ); LOG_CREATE_FUNC( Meter_Indicator_Module );
void process ( nframes_t ) { } void process ( nframes_t );
protected: protected:
void get ( Log_Entry &e ) const; void get ( Log_Entry &e ) const;
void set ( Log_Entry &e ); void set ( Log_Entry &e );
// virtual void draw ( void );
virtual void process ( void );
virtual void draw ( void ) virtual void draw ( void )
{ {
draw_box(); draw_box();