Skip to content

Commit

Permalink
Add cfillion updates to xcode and langpack projects, update whatsnew
Browse files Browse the repository at this point in the history
  • Loading branch information
swstim committed Aug 30, 2017
1 parent 53a2d53 commit 55a22ee
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 4 deletions.
2 changes: 1 addition & 1 deletion BuildUtils/build_template_langpack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# In order to build LangPack files:
# - this script must be performed from <development root>
# - the source tree must be in <development root>/sws/
sws/BuildUtils/Release/BuildLangpack.exe --template sws/*.rc sws/*.cpp sws/SnM/*.cpp sws/Autorender/*.cpp sws/Breeder/*.cpp sws/Color/*.cpp sws/Console/*.cpp sws/Fingers/*.c?? sws/Freeze/*.cpp sws/IX/*.cpp sws/MarkerActions/*.cpp sws/MarkerList/*.cpp sws/Misc/*.cpp sws/nofish/*.cpp sws/ObjectState/*.cpp sws/Padre/*.cpp sws/Projects/*.cpp sws/Snapshots/*.cpp sws/snooks/*.cpp sws/TrackList/*.cpp sws/Utility/*.cpp sws/Wol/*.cpp sws/Xenakios/*.cpp > sws/Install/output/SWS_Template.ReaperLangPack
sws/BuildUtils/Release/BuildLangpack.exe --template sws/*.rc sws/*.cpp sws/SnM/*.cpp sws/Autorender/*.cpp sws/Breeder/*.cpp sws/cfillion/*.cpp sws/Color/*.cpp sws/Console/*.cpp sws/Fingers/*.c?? sws/Freeze/*.cpp sws/IX/*.cpp sws/MarkerActions/*.cpp sws/MarkerList/*.cpp sws/Misc/*.cpp sws/nofish/*.cpp sws/ObjectState/*.cpp sws/Padre/*.cpp sws/Projects/*.cpp sws/Snapshots/*.cpp sws/snooks/*.cpp sws/TrackList/*.cpp sws/Utility/*.cpp sws/Wol/*.cpp sws/Xenakios/*.cpp > sws/Install/output/SWS_Template.ReaperLangPack
3 changes: 1 addition & 2 deletions cfillion/cfillion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
/
******************************************************************************/

#include "cfillion.hpp"

#include "stdafx.h"
#include "cfillion.hpp"

#ifdef _WIN32
static const unsigned int FORMAT = CF_UNICODETEXT;
Expand Down
16 changes: 16 additions & 0 deletions reaper_sws.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@
229AC80D108FBFCB00E4A962 /* SectionLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 229AC80B108FBFCB00E4A962 /* SectionLock.h */; };
22A664BB10BC6FE100F0B239 /* sha.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22A664BA10BC6FE100F0B239 /* sha.cpp */; };
22A8751F10FEBFA10026F62F /* sws_util.mm in Sources */ = {isa = PBXBuildFile; fileRef = 98E8A0AF0F9123F900FC657D /* sws_util.mm */; };
22A8E5861F567AEB00367C27 /* cfillion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22A8E5841F567AEB00367C27 /* cfillion.cpp */; };
22A8E5871F567AEB00367C27 /* cfillion.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 22A8E5851F567AEB00367C27 /* cfillion.hpp */; };
22AC0E0F112A7DE50067BBE3 /* projectcontext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22AC0E0E112A7DE50067BBE3 /* projectcontext.cpp */; };
22AF6E1012308B8D0017808F /* virtwnd-controls.h in Headers */ = {isa = PBXBuildFile; fileRef = 22AF6E0912308B8D0017808F /* virtwnd-controls.h */; };
22AF6E1112308B8D0017808F /* virtwnd-iconbutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22AF6E0A12308B8D0017808F /* virtwnd-iconbutton.cpp */; };
Expand Down Expand Up @@ -460,6 +462,8 @@
229AC7F5108F985C00E4A962 /* MarkerListActions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MarkerListActions.h; path = MarkerList/MarkerListActions.h; sourceTree = "<group>"; };
229AC80B108FBFCB00E4A962 /* SectionLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SectionLock.h; path = Utility/SectionLock.h; sourceTree = "<group>"; };
22A664BA10BC6FE100F0B239 /* sha.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sha.cpp; path = ../WDL/WDL/sha.cpp; sourceTree = SOURCE_ROOT; };
22A8E5841F567AEB00367C27 /* cfillion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cfillion.cpp; path = cfillion/cfillion.cpp; sourceTree = "<group>"; };
22A8E5851F567AEB00367C27 /* cfillion.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = cfillion.hpp; path = cfillion/cfillion.hpp; sourceTree = "<group>"; };
22AC0E0E112A7DE50067BBE3 /* projectcontext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = projectcontext.cpp; path = ../WDL/WDL/projectcontext.cpp; sourceTree = SOURCE_ROOT; };
22AF6E0912308B8D0017808F /* virtwnd-controls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "virtwnd-controls.h"; path = "../WDL/WDL/wingui/virtwnd-controls.h"; sourceTree = SOURCE_ROOT; };
22AF6E0A12308B8D0017808F /* virtwnd-iconbutton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "virtwnd-iconbutton.cpp"; path = "../WDL/WDL/wingui/virtwnd-iconbutton.cpp"; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -746,6 +750,7 @@
isa = PBXGroup;
children = (
4D859DAC16AB127100E34EAA /* Breeder */,
22A8E5791F567AA600367C27 /* cfillion */,
22C77E6612D62EE3002F68D5 /* Fingers */,
22F7AAE315201E0F00CC1481 /* IX */,
225130B11161013E0028F26A /* Padre */,
Expand Down Expand Up @@ -963,6 +968,15 @@
name = Misc;
sourceTree = "<group>";
};
22A8E5791F567AA600367C27 /* cfillion */ = {
isa = PBXGroup;
children = (
22A8E5841F567AEB00367C27 /* cfillion.cpp */,
22A8E5851F567AEB00367C27 /* cfillion.hpp */,
);
name = cfillion;
sourceTree = "<group>";
};
22AC0E0D112A7DAC0067BBE3 /* WDL */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1468,6 +1482,7 @@
22BC765E1D349B5B00014323 /* nofish.h in Headers */,
225597251F56722C00438DE1 /* SN_ReaScript.h in Headers */,
225597271F56722C00438DE1 /* snooks.h in Headers */,
22A8E5871F567AEB00367C27 /* cfillion.hpp in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1756,6 +1771,7 @@
223EACF41E97470B00A32FCE /* swell-modstub.mm in Sources */,
225597241F56722C00438DE1 /* SN_ReaScript.cpp in Sources */,
225597261F56722C00438DE1 /* snooks.cpp in Sources */,
22A8E5861F567AEB00367C27 /* cfillion.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
12 changes: 12 additions & 0 deletions reascript_vararg.h
Original file line number Diff line number Diff line change
Expand Up @@ -572,5 +572,17 @@ static void* __vararg_SN_FocusMIDIEditor(void** arglist, int numparms)
return NULL;
}

static void* __vararg_CF_SetClipboard(void** arglist, int numparms)
{
CF_SetClipboard((const char*)arglist[0]);
return NULL;
}

static void* __vararg_CF_GetClipboard(void** arglist, int numparms)
{
CF_GetClipboard((char*)arglist[0], (int)(INT_PTR)arglist[1]);
return NULL;
}


#endif
4 changes: 3 additions & 1 deletion whatsnew.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ Action

New ReaScript functions:
+SN_FocusMIDIEditor() - focuses windowed or docked MIDI editor
+Issue 880:
+Issue 880: (thanks, nofish!)
- NF_AnalyzeTakeLoudness_IntegratedOnly()
- NF_AnalyzeTakeLoudness()
- NF_AnalyzeTakeLoudness2()
+CF_SetClipboard() - Write a given string into the system clipboard
+CF_GetClipboard() - Read the contents of the system clipboard

Fixes:
+Issue 587: "SWS/AW: Toggle auto group newly recorded items" now also works in takes recording mode
Expand Down

0 comments on commit 55a22ee

Please sign in to comment.