• R/O
  • SSH

freeverb3_vst: コミット

Freeverb3 VST plugins


コミットメタ情報

リビジョン634b65c2295abad6a790e95796f21d825a60df19 (tree)
日時2017-07-12 21:13:36
作者Teru Kamogashira <tkamogashira@user...>
コミッターTeru Kamogashira

ログメッセージ

Fixed GUI Segmentation Fault

変更サマリ

差分

diff -r e1956b2570dc -r 634b65c2295a Res/libFReverbResource.rc
--- a/Res/libFReverbResource.rc Thu Jun 30 12:55:35 2016 +0900
+++ b/Res/libFReverbResource.rc Wed Jul 12 21:13:36 2017 +0900
@@ -26,7 +26,7 @@
2626 BEGIN
2727 VALUE "CompanyName", "Wind\0"
2828 VALUE "FileDescription", "Freeverb3 Freeverb VST Plug-in\0"
29- VALUE "FileVersion", __DATE__ " " __TIME__ "\0"
29+ VALUE "FileVersion", __DATE__ " " __TIME__ " " __VERSION__ "\0"
3030 VALUE "ProductName", "Freeverb3_vst Freeverb\0"
3131 VALUE "ProductVersion", PACKAGE DIST_STRING "\0"
3232 VALUE "InternalName", "Resources\0"
diff -r e1956b2570dc -r 634b65c2295a Res/libFreeverb3Resource.rc
--- a/Res/libFreeverb3Resource.rc Thu Jun 30 12:55:35 2016 +0900
+++ b/Res/libFreeverb3Resource.rc Wed Jul 12 21:13:36 2017 +0900
@@ -40,7 +40,7 @@
4040 BEGIN
4141 VALUE "CompanyName", "Wind\0"
4242 VALUE "FileDescription", "Freeverb3 Impulser2 VST Plug-in\0"
43- VALUE "FileVersion", __DATE__ " " __TIME__ "\0"
43+ VALUE "FileVersion", __DATE__ " " __TIME__ " " __VERSION__ "\0"
4444 VALUE "ProductName", "Freeverb3_vst Impulser2\0"
4545 VALUE "ProductVersion", PACKAGE DIST_STRING "\0"
4646 VALUE "InternalName", "Resources\0"
diff -r e1956b2570dc -r 634b65c2295a Res/libHibikiReverbResource.rc
--- a/Res/libHibikiReverbResource.rc Thu Jun 30 12:55:35 2016 +0900
+++ b/Res/libHibikiReverbResource.rc Wed Jul 12 21:13:36 2017 +0900
@@ -26,7 +26,7 @@
2626 BEGIN
2727 VALUE "CompanyName", "Wind\0"
2828 VALUE "FileDescription", "Freeverb3 Hibiki Reverb VST Plug-in\0"
29- VALUE "FileVersion", __DATE__ " " __TIME__ "\0"
29+ VALUE "FileVersion", __DATE__ " " __TIME__ " " __VERSION__ "\0"
3030 VALUE "ProductName", "Freeverb3_vst Hibiki Reverb\0"
3131 VALUE "ProductVersion", PACKAGE DIST_STRING "\0"
3232 VALUE "InternalName", "Resources\0"
diff -r e1956b2570dc -r 634b65c2295a Res/libMBCompressorResource.rc
--- a/Res/libMBCompressorResource.rc Thu Jun 30 12:55:35 2016 +0900
+++ b/Res/libMBCompressorResource.rc Wed Jul 12 21:13:36 2017 +0900
@@ -33,7 +33,7 @@
3333 BEGIN
3434 VALUE "CompanyName", "Wind\0"
3535 VALUE "FileDescription", "Freeverb3 WindCompressor VST Plug-in\0"
36- VALUE "FileVersion", __DATE__ " " __TIME__ "\0"
36+ VALUE "FileVersion", __DATE__ " " __TIME__ " " __VERSION__ "\0"
3737 VALUE "ProductName", "Freeverb3_vst WindCompressor\0"
3838 VALUE "ProductVersion", PACKAGE DIST_STRING "\0"
3939 VALUE "InternalName", "Resources\0"
diff -r e1956b2570dc -r 634b65c2295a Res/libNReverbResource.rc
--- a/Res/libNReverbResource.rc Thu Jun 30 12:55:35 2016 +0900
+++ b/Res/libNReverbResource.rc Wed Jul 12 21:13:36 2017 +0900
@@ -26,7 +26,7 @@
2626 BEGIN
2727 VALUE "CompanyName", "Wind\0"
2828 VALUE "FileDescription", "Freeverb3 NReverb VST Plug-in\0"
29- VALUE "FileVersion", __DATE__ " " __TIME__ "\0"
29+ VALUE "FileVersion", __DATE__ " " __TIME__ " " __VERSION__ "\0"
3030 VALUE "ProductName", "Freeverb3_vst NReverb\0"
3131 VALUE "ProductVersion", PACKAGE DIST_STRING "\0"
3232 VALUE "InternalName", "Resources\0"
diff -r e1956b2570dc -r 634b65c2295a Res/libProGReverbResource.rc
--- a/Res/libProGReverbResource.rc Thu Jun 30 12:55:35 2016 +0900
+++ b/Res/libProGReverbResource.rc Wed Jul 12 21:13:36 2017 +0900
@@ -26,7 +26,7 @@
2626 BEGIN
2727 VALUE "CompanyName", "Wind\0"
2828 VALUE "FileDescription", "Freeverb3 ProG Reverb VST Plug-in\0"
29- VALUE "FileVersion", __DATE__ " " __TIME__ "\0"
29+ VALUE "FileVersion", __DATE__ " " __TIME__ " " __VERSION__ "\0"
3030 VALUE "ProductName", "Freeverb3_vst Progenitor Reverb\0"
3131 VALUE "ProductVersion", PACKAGE DIST_STRING "\0"
3232 VALUE "InternalName", "Resources\0"
diff -r e1956b2570dc -r 634b65c2295a Res/libSTRevResource.rc
--- a/Res/libSTRevResource.rc Thu Jun 30 12:55:35 2016 +0900
+++ b/Res/libSTRevResource.rc Wed Jul 12 21:13:36 2017 +0900
@@ -26,7 +26,7 @@
2626 BEGIN
2727 VALUE "CompanyName", "Wind\0"
2828 VALUE "FileDescription", "Freeverb3 STRev VST Plug-in\0"
29- VALUE "FileVersion", __DATE__ " " __TIME__ "\0"
29+ VALUE "FileVersion", __DATE__ " " __TIME__ " " __VERSION__ "\0"
3030 VALUE "ProductName", "Freeverb3_vst Simple Tank Reverb\0"
3131 VALUE "ProductVersion", PACKAGE DIST_STRING "\0"
3232 VALUE "InternalName", "Resources\0"
diff -r e1956b2570dc -r 634b65c2295a Res/libStenhResource.rc
--- a/Res/libStenhResource.rc Thu Jun 30 12:55:35 2016 +0900
+++ b/Res/libStenhResource.rc Wed Jul 12 21:13:36 2017 +0900
@@ -26,7 +26,7 @@
2626 BEGIN
2727 VALUE "CompanyName", "Wind\0"
2828 VALUE "FileDescription", "Freeverb3 StereoEnhancer VST Plug-in\0"
29- VALUE "FileVersion", __DATE__ " " __TIME__ "\0"
29+ VALUE "FileVersion", __DATE__ " " __TIME__ " " __VERSION__ "\0"
3030 VALUE "ProductName", "Freeverb3_vst StereoEnhancer\0"
3131 VALUE "ProductVersion", PACKAGE DIST_STRING "\0"
3232 VALUE "InternalName", "Resources\0"
diff -r e1956b2570dc -r 634b65c2295a Res/libX1_LimiterResource.rc
--- a/Res/libX1_LimiterResource.rc Thu Jun 30 12:55:35 2016 +0900
+++ b/Res/libX1_LimiterResource.rc Wed Jul 12 21:13:36 2017 +0900
@@ -26,7 +26,7 @@
2626 BEGIN
2727 VALUE "CompanyName", "Wind\0"
2828 VALUE "FileDescription", "Freeverb3 X1 Limiter VST Plug-in\0"
29- VALUE "FileVersion", __DATE__ " " __TIME__ "\0"
29+ VALUE "FileVersion", __DATE__ " " __TIME__ " " __VERSION__ "\0"
3030 VALUE "ProductName", "Freeverb3_vst X1 Limiter\0"
3131 VALUE "ProductVersion", PACKAGE DIST_STRING "\0"
3232 VALUE "InternalName", "Resources\0"
diff -r e1956b2570dc -r 634b65c2295a VstMain/Freeverb.cpp
--- a/VstMain/Freeverb.cpp Thu Jun 30 12:55:35 2016 +0900
+++ b/VstMain/Freeverb.cpp Wed Jul 12 21:13:36 2017 +0900
@@ -41,7 +41,7 @@
4141 CFILELOADER fileLoader;
4242 const char *newFilename = NULL, *prevFilename = NULL;
4343 Freeverb * fv = static_cast<Freeverb*>(info->fv);
44- FreeverbEditor * fve = *static_cast<FreeverbEditor**>(info->fve);
44+ FreeverbEditor * fve = static_cast<FreeverbEditor*>(fv->getEditor());
4545 int ret = 0;
4646 fv->writeLogA("executeEvent: EventId=0x%02x\n", info->kmevent);
4747 switch(info->kmevent)
@@ -56,13 +56,13 @@
5656 {
5757 if(strcmp(prevFilename, newFilename) == 0)
5858 {
59- fv->writeLogA("executeEvent: The file is already loaded.\n");
59+ fv->writeLogA("executeEvent: The same file has been already loaded.\n");
6060 break;
6161 }
6262 }
6363 if(strcmp(newFilename, "") == 0||newFilename == NULL)
6464 {
65- fv->writeLogA("executeEvent: The target file is (null).\n");
65+ fv->writeLogA("executeEvent: The target filename is (null), ignored...\n");
6666 break;
6767 }
6868 if(fve != NULL) fve->setSlotLabelA(info->channel, " Loading...");
@@ -193,7 +193,6 @@
193193 zl = true;
194194 // Start Event Executer Thread
195195 hostThreadData.fv = this;
196- hostThreadData.fve = (void**)&editor;
197196 hostThreadData.flags = &threadFlags;
198197 hostThreadData.ecue = &eventCue;
199198 hostThreadData.cueLocker = &eventCueLocker;
@@ -314,14 +313,14 @@
314313 VstInt32 Freeverb::canDo(char* text)
315314 {
316315 VstInt32 ret = -1;
317- writeLogA("host requested canDo(%s):", text);
316+ writeLogA("canDo: host requested (%s):", text);
318317 if(!strcmp(text, "bypass")) ret = 1;
319318 if(!strcmp(text, "1in1out")) ret = 1;
320319 if(!strcmp(text, "2in2out")) ret = 1;
321320 if(!strcmp(text, "1in2out")) ret = 1;
322321 if(!strcmp(text, "receiveVstEvents")) ret = 1;
323322 if(!strcmp(text, "receiveVstMidiEvent")) ret = 1;
324- if(!strcmp(text, "receiveVstMidiEvents")) ret = 1; // for typo
323+ if(!strcmp(text, "receiveVstMidiEvents")) ret = 1; // for typo compatibility
325324 writeLogA("%d\n", ret);
326325 return ret;
327326 }
@@ -391,7 +390,7 @@
391390 }
392391
393392 #ifdef DEBUG
394- writeLogA("processEvents: MIDI %2x %2x %2x\n", midiData[0], midiData[1], midiData[2]);
393+ writeLogA("processEvents: MIDI event 0x%02x 0x%02x 0x%02x\n", midiData[0], midiData[1], midiData[2]);
395394 #endif
396395
397396 // [9n oo vv] NOTE ON
@@ -432,7 +431,6 @@
432431 lfeeinfo.kmevent = kmevent;
433432 lfeeinfo.channel = Channel;
434433 lfeeinfo.fv = this;
435- lfeeinfo.fve = &editor;
436434 lfeeinfo.targetFilename = irFilename;
437435 lfeeinfo.ta = getNRTParameter(KNRTParam(Channel,KIRAttack));
438436 lfeeinfo.th = getNRTParameter(KNRTParam(Channel,KIRHold));
@@ -596,7 +594,7 @@
596594
597595 int slot = index/KNumParams;
598596 index = index%KNumParams;
599-#ifdef DEBUG
597+#ifdef DEBUG
600598 writeLogA("getParameter slot[%d] index[%d]\n", slot, index);
601599 #endif
602600 float ret = 0.0f;
@@ -1138,7 +1136,7 @@
11381136 writeLogA("Impulser2: setChunk: Chunk was updated. (%d -> %d)\n", chunk.getVersion(), FV3_IR2_CHUNK_VERSION_CURRENT);
11391137 chunk.setVersion(FV3_IR2_CHUNK_VERSION_CURRENT);
11401138 }
1141- // 2 .GUI only Parameters including IR files
1139+ // 2. GUI only Parameters including IR files
11421140 for(int si = 0;si < MODEL_SLOT_SIZE;si ++)
11431141 {
11441142 char * cfilename = NULL;
@@ -1240,7 +1238,6 @@
12401238 lfeeinfo.kmevent = KMEventLoadBG;
12411239 lfeeinfo.channel = slot;
12421240 lfeeinfo.fv = this;
1243- lfeeinfo.fve = &editor;
12441241 lfeeinfo.targetFilename = filename;
12451242 lfeeinfo.ta = getNRTParameter(KNRTParam(slot,KIRAttack));
12461243 lfeeinfo.th = getNRTParameter(KNRTParam(slot,KIRHold));
diff -r e1956b2570dc -r 634b65c2295a VstMain/Freeverb.hpp
--- a/VstMain/Freeverb.hpp Thu Jun 30 12:55:35 2016 +0900
+++ b/VstMain/Freeverb.hpp Wed Jul 12 21:13:36 2017 +0900
@@ -113,7 +113,7 @@
113113 } lfEventExecuterInfo;
114114
115115 typedef struct {
116- void *fv, **fve;
116+ void *fv;
117117 std::vector<lfEventExecuterInfo> * ecue;
118118 volatile int * flags;
119119 Locker * cueLocker;
diff -r e1956b2570dc -r 634b65c2295a VstMain/FreeverbEditor.cpp
--- a/VstMain/FreeverbEditor.cpp Thu Jun 30 12:55:35 2016 +0900
+++ b/VstMain/FreeverbEditor.cpp Wed Jul 12 21:13:36 2017 +0900
@@ -505,7 +505,6 @@
505505 for(int si = 0;si < MODEL_SLOT_SIZE;si ++)
506506 {
507507 cSlotLabel[si] = new CTextLabel(size, "", 0);
508- setSlotLabelA(si, (char*)freeverb->getSlotFileNameA(si));
509508 cSlotLabel[si]->setFont(kNormalFont);
510509 cSlotLabel[si]->setFontColor(kBlueCColor);
511510 cSlotLabel[si]->setBackColor(kWhiteCColor);
@@ -556,6 +555,11 @@
556555
557556 frame->setDirty();
558557 this->frame = frame;
558+
559+ // setSlotLabeA runs under frame != NULL
560+ for(int si = 0;si < MODEL_SLOT_SIZE;si ++)
561+ setSlotLabelA(si, (char*)freeverb->getSlotFileNameA(si));
562+
559563 return true;
560564 }
561565
@@ -952,7 +956,8 @@
952956
953957 void FreeverbEditor::setFileNameLabelA(const char * filename)
954958 {
955- if(frame != NULL) cLabel->setText(filename);
959+ if(frame == NULL) return;
960+ cLabel->setText(filename);
956961 }
957962
958963 void FreeverbEditor::setViewSlot(int slot)
@@ -1001,7 +1006,8 @@
10011006
10021007 void FreeverbEditor::setSlotLabelA(int slot, const char * filename)
10031008 {
1004- if(filename == NULL) return;
1009+ if(frame == NULL) return;
1010+ if(filename == NULL||strlen(filename) == 0) return;
10051011 if(filename[0] != ' ')
10061012 {
10071013 #ifdef WIN32
diff -r e1956b2570dc -r 634b65c2295a configure.ac
--- a/configure.ac Thu Jun 30 12:55:35 2016 +0900
+++ b/configure.ac Wed Jul 12 21:13:36 2017 +0900
@@ -17,7 +17,7 @@
1717
1818 RELEASE=3
1919 MAJOR=1
20-MINOR=1
20+MINOR=2
2121
2222 AM_INIT_AUTOMAKE(freeverb3_vst, $RELEASE.$MAJOR.$MINOR)
2323 eval LIBTOOL_VERSION_INFO="$((RELEASE+MAJOR)):$MINOR:$MAJOR"
diff -r e1956b2570dc -r 634b65c2295a cross-sh/build_fftw.sh
--- a/cross-sh/build_fftw.sh Thu Jun 30 12:55:35 2016 +0900
+++ b/cross-sh/build_fftw.sh Wed Jul 12 21:13:36 2017 +0900
@@ -4,7 +4,7 @@
44
55 source cross-set.sh
66
7-MAKE="make -j2"
7+MAKE="make -j4"
88 FFTW3_SRC=fftw-3.3.4.tar.gz
99 FFTW3_DIR=fftw-3.3.4
1010
@@ -158,3 +158,4 @@
158158 $MAKE; cp .libs/libfftw3f.a ../libfftw3f-mac-ppc.a)
159159
160160 i686-apple-darwin8-lipo -create libfftw3f-mac-x86.a libfftw3f-mac-ppc.a libfftw3f-mac-x64.a libfftw3f-mac-ppc64.a -output libfftw3f-mac.a
161+
diff -r e1956b2570dc -r 634b65c2295a lib/libfftw3-avx.la
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libfftw3-avx.la Wed Jul 12 21:13:36 2017 +0900
@@ -0,0 +1,42 @@
1+# libfftw3.la - a libtool library file
2+# Generated by ltmain.sh (GNU libtool) 2.2.6b Debian-2.2.6b-2
3+#
4+# Please DO NOT delete this file!
5+# It is necessary for linking the library.
6+
7+# The name that we can dlopen(3).
8+dlname=''
9+
10+# Names of this library.
11+library_names=''
12+
13+# The name of the static archive.
14+old_library='libfftw3-avx.a'
15+
16+# Linker flags that can not go in dependency_libs.
17+inherited_linker_flags=''
18+
19+# Libraries that this one depends upon.
20+dependency_libs=''
21+
22+# Names of additional weak libraries provided by this library
23+weak_library_names=''
24+
25+# Version information for libfftw3.
26+current=6
27+age=3
28+revision=0
29+
30+# Is this an already installed library?
31+installed=no
32+
33+# Should we warn about portability when linking against -modules?
34+shouldnotlink=no
35+
36+# Files to dlopen/dlpreopen
37+dlopen=''
38+dlpreopen=''
39+
40+# Directory that this library needs to be installed in:
41+libdir=''
42+
diff -r e1956b2570dc -r 634b65c2295a libsndfile/G72x/.libs/libg72x.a
Binary file libsndfile/G72x/.libs/libg72x.a has changed
diff -r e1956b2570dc -r 634b65c2295a libsndfile/GSM610/.libs/libgsm.a
Binary file libsndfile/GSM610/.libs/libgsm.a has changed
旧リポジトリブラウザで表示