diff --git a/Mixer/Gain_Module.C b/Mixer/Gain_Module.C index 8045e0b..0ddd30b 100644 --- a/Mixer/Gain_Module.C +++ b/Mixer/Gain_Module.C @@ -18,7 +18,7 @@ /*******************************************************************************/ #include "Gain_Module.H" -#include + #include #include diff --git a/Mixer/Mono_Pan_Module.C b/Mixer/Mono_Pan_Module.C new file mode 100644 index 0000000..cf94055 --- /dev/null +++ b/Mixer/Mono_Pan_Module.C @@ -0,0 +1,85 @@ + +/*******************************************************************************/ +/* Copyright (C) 2009 Jonathan Moore Liles */ +/* */ +/* This program is free software; you can redistribute it and/or modify it */ +/* under the terms of the GNU General Public License as published by the */ +/* Free Software Foundation; either version 2 of the License, or (at your */ +/* option) any later version. */ +/* */ +/* This program is distributed in the hope that it will be useful, but WITHOUT */ +/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */ +/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */ +/* more details. */ +/* */ +/* You should have received a copy of the GNU General Public License along */ +/* with This program; see the file COPYING. If not,write to the Free Software */ +/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/*******************************************************************************/ + +#include "Mono_Pan_Module.H" + +#include +#include + +Mono_Pan_Module::Mono_Pan_Module ( ) + : Module ( 50, 24, name() ) +{ + Port p( this, Port::INPUT, Port::CONTROL, "Pan" ); + p.hints.type = Port::Hints::LOGARITHMIC; + p.hints.ranged = true; + p.hints.minimum = -1.0f; + p.hints.maximum = 1.0f; + p.hints.default_value = 0.0f; + + p.connect_to( new float ); + p.control_value( p.hints.default_value ); + + add_port( p ); + + add_port( Port( this, Port::INPUT, Port::AUDIO ) ); + add_port( Port( this, Port::OUTPUT, Port::AUDIO ) ); + add_port( Port( this, Port::OUTPUT, Port::AUDIO ) ); + + end(); + + log_create(); +} + +Mono_Pan_Module::~Mono_Pan_Module ( ) +{ + delete (float*)control_input[0].buffer(); + log_destroy(); +} + + + +bool +Mono_Pan_Module::configure_inputs ( int n ) +{ + return true; +} + + + +void +Mono_Pan_Module::process ( void ) +{ + const float g = control_input[0].control_value(); + +// this is obviously wrong, but it produces a strange false stereo effect. +// const float lg = (0.0f - g); +// const float rg = g; + + const float lg = (0.0f - g) + 1.0f; + const float rg = g + 1.0f; + + if ( audio_input[0].connected() && + audio_output[0].connected() && + audio_output[1].connected() ) + { + buffer_copy_and_apply_gain( (sample_t*)audio_output[1].buffer(), (sample_t*)audio_input[0].buffer(), nframes(), rg ); + + buffer_apply_gain( (sample_t*)audio_output[0].buffer(), nframes(), lg ); + } +} diff --git a/Mixer/Mono_Pan_Module.H b/Mixer/Mono_Pan_Module.H new file mode 100644 index 0000000..db0a0bf --- /dev/null +++ b/Mixer/Mono_Pan_Module.H @@ -0,0 +1,42 @@ + +/*******************************************************************************/ +/* Copyright (C) 2009 Jonathan Moore Liles */ +/* */ +/* This program is free software; you can redistribute it and/or modify it */ +/* under the terms of the GNU General Public License as published by the */ +/* Free Software Foundation; either version 2 of the License, or (at your */ +/* option) any later version. */ +/* */ +/* This program is distributed in the hope that it will be useful, but WITHOUT */ +/* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or */ +/* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for */ +/* more details. */ +/* */ +/* You should have received a copy of the GNU General Public License along */ +/* with This program; see the file COPYING. If not,write to the Free Software */ +/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/*******************************************************************************/ + +#pragma once + +#include "Module.H" + +class Mono_Pan_Module : public Module +{ +public: + + Mono_Pan_Module ( ); + virtual ~Mono_Pan_Module ( ); + + const char *name ( void ) const { return "Mono Pan"; } + + int can_support_inputs ( int n ) { return ( n == 1 ) ? 2 : -1; } + bool configure_inputs ( int n ); + + LOG_CREATE_FUNC( Mono_Pan_Module ); + +protected: + + virtual void process ( void ); + +}; diff --git a/Mixer/main.C b/Mixer/main.C index 1c2e92d..29ad5a1 100644 --- a/Mixer/main.C +++ b/Mixer/main.C @@ -52,6 +52,7 @@ Fl_Single_Window *main_window; #include "Meter_Module.H" #include "Meter_Indicator_Module.H" #include "Controller_Module.H" +#include "Mono_Pan_Module.H" #include "Chain.H" @@ -82,6 +83,7 @@ main ( int argc, char **argv ) LOG_REGISTER_CREATE( Gain_Module ); LOG_REGISTER_CREATE( Meter_Module ); LOG_REGISTER_CREATE( JACK_Module ); + LOG_REGISTER_CREATE( Mono_Pan_Module ); LOG_REGISTER_CREATE( Meter_Indicator_Module ); LOG_REGISTER_CREATE( Controller_Module );