Browse Source

fixed stream bug

master
nebogeo 23 years ago
parent
commit
91a8f3bdf0
2 changed files with 15 additions and 8 deletions
  1. +7
    -3
      SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C
  2. +8
    -5
      SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.C

+ 7
- 3
SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C View File

@@ -58,14 +58,17 @@ m_Num(4)
for (int n=0; n<MAX_CHANNELS; n++)
{
m_ChannelVal[n]=0.0f;
m_ChannelVal[n]=0.0f;
m_MinVal[n]=-1.0f;
m_MaxVal[n]=1.0f;
m_Names[n]="Name";
}
m_AudioCH->Register("Number",&m_GUIArgs.Number);
m_AudioCH->Register("Value",&m_GUIArgs.Value);
m_AudioCH->Register("Min",&m_GUIArgs.Min);
m_AudioCH->Register("Max",&m_GUIArgs.Max);
m_AudioCH->RegisterData("Name",ChannelHandler::INPUT,m_GUIArgs.Name,sizeof(m_GUIArgs.Name));
m_AudioCH->RegisterData("Name",ChannelHandler::INPUT,m_GUIArgs.Name,256);
}

ControllerPlugin::~ControllerPlugin()
@@ -102,6 +105,7 @@ void ControllerPlugin::ExecuteCommands()
switch (m_AudioCH->GetCommand())
{
case (SETCHANNEL) :
cerr<<m_GUIArgs.Name<<endl;
SetChannel(m_GUIArgs.Number,m_GUIArgs.Value,m_GUIArgs.Min,m_GUIArgs.Max,m_GUIArgs.Name);
break;
case (SETNUM) :
@@ -164,7 +168,7 @@ void ControllerPlugin::StreamOut(ostream &s)
s<<m_Num<<" ";
for (int n=0; n<m_Num; n++)
{
s<<m_Names[n].size()<<endl;
s<<m_Names[n].size()<<" ";
s<<m_Names[n]<<" ";
s<<m_MinVal[n]<<" ";
s<<m_MaxVal[n]<<" ";


+ 8
- 5
SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.C View File

@@ -157,13 +157,16 @@ inline void ControllerPluginGUI::cb_Chan_i(Fl_Slider* o, void* v)
long max=strtol(m_GuiVec[num]->m_Min->value(),NULL,10);
long min=strtol(m_GuiVec[num]->m_Max->value(),NULL,10);
float val=o->value()*(max-min)+min;
m_GUICH->Set("Number",num);
m_GUICH->Set("Value",val);
m_GUICH->Set("Min",(int)min);
m_GUICH->Set("Max",(int)max);
m_GUICH->Set("Number",(int)num);
m_GUICH->Set("Value",(float)val);
m_GUICH->Set("Min",(float)min);
m_GUICH->Set("Max",(float)max);
char temp[256];
sprintf(temp,"%s",m_GuiVec[num]->m_Title->value());
m_GUICH->Set("Name",temp);
cerr<<"sending "<<temp<<endl;
m_GUICH->SetData("Name",(void*)temp);
m_GUICH->SetCommand(ControllerPlugin::SETCHANNEL);
}
void ControllerPluginGUI::cb_Chan(Fl_Slider* o, void* v)


Loading…
Cancel
Save