|
@@ -679,7 +679,7 @@ laAudioChannel* laNewAudioChannel(char* Name){
|
|
|
}
|
|
|
void laRemoveAudioChannel(laAudioChannel* ac){
|
|
|
lstRemoveItem(&MAIN.Audio->Channels,ac); strSafeDestroy(&ac->Name);
|
|
|
- memFree(ac);
|
|
|
+ memLeave(ac);
|
|
|
}
|
|
|
laAudioChannel* laGetAudioChannel(char* Name){
|
|
|
for(laAudioChannel* ac=MAIN.Audio->Channels.pFirst;ac;ac=ac->Item.pNext){
|
|
@@ -765,7 +765,7 @@ void laui_AudioChannel(laUiList *uil, laPropPack *This, laPropPack *Extra, laCol
|
|
|
|
|
|
b=laBeginRow(uil,c2,0,0);
|
|
|
laShowItem(uil,c2,This,"name")->Expand=1;
|
|
|
- laShowItem(uil,c,This,"remove")->Flags|=LA_UI_FLAGS_ICON;
|
|
|
+ laShowItem(uil,c2,This,"remove")->Flags|=LA_UI_FLAGS_ICON;
|
|
|
laEndRow(uil,b);
|
|
|
laShowItem(uil,c2,This,"volume");
|
|
|
|
|
@@ -867,7 +867,7 @@ void laInitAudio(){
|
|
|
|
|
|
pc = laAddPropertyContainer("la_audio_channel", "LaGUI Audio Channel", "LaGUI Audio Channel", 0,0,sizeof(laAudioChannel),0,0,2);{
|
|
|
LA_PC_CHANNEL=pc;
|
|
|
- laAddStringProperty(pc,"name","Name","Name of the synthesizer",0,0,0,0,1,offsetof(laAudioChannel,Name),0,0,0,0,LA_AS_IDENTIFIER);
|
|
|
+ laAddStringProperty(pc,"name","Name","Name of the channel",0,0,0,0,1,offsetof(laAudioChannel,Name),0,0,0,0,LA_AS_IDENTIFIER);
|
|
|
laAddFloatProperty(pc,"volume","Volume","Volume of this channel",0,0,0,15,0,0.05,0,0,offsetof(laAudioChannel,Volume),0,0,0,0,0,0,0,0,0,0,0);
|
|
|
laAddOperatorProperty(pc,"remove","Remove Channel", "Remove this channel", "LA_remove_channel", L'🗴', 0);
|
|
|
laAddIntProperty(pc,"__move","Move Slider","Move Slider",LA_WIDGET_HEIGHT_ADJUSTER,0,0,0,0,0,0,0,0,0,laset_AudioChannelMove,0,0,0,0,0,0,0,0,LA_UDF_IGNORE);
|
|
@@ -929,7 +929,7 @@ void laInitAudio(){
|
|
|
laAddSubGroup(pc,"base","Base","Base node","la_base_node",0,0,0,0,0,0,0,0,0,0,0,LA_UDF_LOCAL);
|
|
|
laAddSubGroup(pc,"in", "Input","Input sound","la_in_socket",0,0,0,offsetof(laSynthNodeOutput,In),0,0,0,0,0,0,0,LA_UDF_SINGLE);
|
|
|
laAddStringProperty(pc,"send_channel_name","Channel Name","Channel name of this send target",0,0,0,0,1,offsetof(laSynthNodeOutput,SendName),0,0,0,0,0);
|
|
|
- laAddSubGroup(pc,"send_channel_selector","Send","Send to channel","la_audio_channel",0,0,0,-1,laget_FirstAudioChannel,0,laget_ListNext,laset_OutputSendChannel,0,0,0,0);
|
|
|
+ laAddSubGroup(pc,"send_channel_selector","Send","Send to channel","la_audio_channel",0,0,0,-1,laget_FirstAudioChannel,0,laget_ListNext,laset_OutputSendChannel,0,0,0,LA_UDF_REFER|LA_UDF_IGNORE);
|
|
|
|
|
|
pc=laAddPropertyContainer("la_node_synth_envelope", "Envelope Node", "Sound envelope",0,laui_EnvelopeNode,sizeof(laSynthNodeEnvelope),lapost_Node,0,1);
|
|
|
LA_PC_IDN_ENVELOPE=pc; laPropContainerExtraFunctions(pc,0,0,0,0,laui_DefaultNodeOperationsPropUiDefine);
|