From 92716b103d7ad289550cc4b5b6578c308da4f065 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Tue, 19 Mar 2013 18:37:00 -0700 Subject: [PATCH] Mixer: Only display spatialization control when strip is in Fader view. Closes #36. --- mixer/src/Mixer_Strip.C | 16 +++++++++++++++- mixer/src/Mixer_Strip.H | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mixer/src/Mixer_Strip.C b/mixer/src/Mixer_Strip.C index cca6774..99e8282 100644 --- a/mixer/src/Mixer_Strip.C +++ b/mixer/src/Mixer_Strip.C @@ -230,6 +230,7 @@ void Mixer_Strip::cb_handle(Fl_Widget* o) { tab_group->resizable( signal_tab ); } + set_spatializer_visibility(); } else if ( o == left_button ) command_move_left(); @@ -296,6 +297,19 @@ Mixer_Strip::configure_outputs ( void ) DMESSAGE( "Got signal to configure outputs" ); } +void +Mixer_Strip::set_spatializer_visibility ( void ) +{ + if ( fader_tab->visible() && spatialization_controller->is_controlling() ) + { + spatialization_controller->show(); + } + else + { + spatialization_controller->hide(); + } +} + /* called by the chain to let us know that a module has been added */ void Mixer_Strip::handle_module_added ( Module *m ) @@ -324,8 +338,8 @@ Mixer_Strip::handle_module_added ( Module *m ) { if ( spatialization_controller->connect_spatializer_to( m ) ) { - spatialization_controller->show(); DMESSAGE( "Connected spatializer to module \"%s\"", m->name() ); + set_spatializer_visibility(); } } } diff --git a/mixer/src/Mixer_Strip.H b/mixer/src/Mixer_Strip.H index 7b3f7dc..c1a64aa 100644 --- a/mixer/src/Mixer_Strip.H +++ b/mixer/src/Mixer_Strip.H @@ -128,6 +128,8 @@ private: void snapshot ( void ); bool export_strip ( const char *filename ); + void set_spatializer_visibility ( void ); + protected: void get ( Log_Entry &e ) const;