Skip to content

Commit 35cd42d

Browse files
committed
rxfx_TuringComplete: cleanup
1 parent 8f9e862 commit 35cd42d

6 files changed

Lines changed: 28 additions & 39 deletions

Web Interfaces/rxfx_Turing-complete/rxfx_Turing-complete - New project.lua

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@ function NewProject()
1010
if reaper.CountMediaItems(0) ~= 0 then
1111
reaper.SetExtState("Fanciest","ProjectSave","autosave_"..os.date(),false)
1212
local scriptFolder = ({ reaper.get_action_context() })[2]:match('^.+[\\//]')
13-
dofile(scriptFolder.."rxfx_CustomFancy_SaveProjectAs.lua")
13+
dofile(scriptFolder.."rxfx_Turing-complete - Save project as.lua")
1414
end
1515
end
16-
16+
1717
-- open selected project
1818
local folder = reaper.GetExtState("Fanciest", "ProjectFolder")
1919
local projectFile = reaper.GetExtState("Fanciest", "ProjectLoad")
2020
reaper.Main_openProject("noprompt:/")
21-
21+
2222
end
2323

2424
NewProject()
25-

Web Interfaces/rxfx_Turing-complete/rxfx_Turing-complete - Open selected project.lua

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,15 @@ function OpenSelectedProject()
1010
if reaper.CountMediaItems(0) ~= 0 then
1111
reaper.SetExtState("Fanciest","ProjectSave","autosave_"..os.date(),false)
1212
local scriptFolder = ({ reaper.get_action_context() })[2]:match('^.+[\\//]')
13-
dofile(scriptFolder.."rxfx_CustomFancy_SaveProjectAs.lua")
13+
dofile(scriptFolder.."rxfx_Turing-complete - Save project as.lua")
1414
end
1515
end
16-
16+
1717
-- open selected project
1818
local folder = reaper.GetExtState("Fanciest", "ProjectFolder")
1919
local projectFile = reaper.GetExtState("Fanciest", "ProjectLoad")
2020
reaper.Main_openProject("noprompt:" .. folder .. projectFile)
21-
21+
2222
end
2323

2424
OpenSelectedProject()
25-

Web Interfaces/rxfx_Turing-complete/rxfx_Turing-complete - Read current project.lua

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
-- @noindex
22

33

4-
function SendProjectList()
4+
function ReadCurrentProject()
55
-- send project name
66
ProjectName=reaper.GetProjectName(0)
77
reaper.SetExtState("Fanciest","CurrentProject",ProjectName,false)
8-
8+
99
-- send loop points (by marker index)
1010
local first, second = reaper.GetSet_LoopTimeRange(0, 0, 0, 0, 0)
1111
count = reaper.GetNumRegionsOrMarkers(0)
@@ -22,7 +22,7 @@ function SendProjectList()
2222
n[#n+1] = "end"
2323
m[#m+1] = 0
2424
n[#n+1] = "home"
25-
25+
2626
for idx, val in ipairs(m) do
2727
if math.abs(first-val)<0.02 then
2828
finalfirst = n[idx]
@@ -31,7 +31,7 @@ function SendProjectList()
3131
if finalfirst == nil then
3232
reaper.GetSet_LoopTimeRange(1, 0, 0, 0, 0)
3333
end
34-
34+
3535
for idx, val in ipairs(m) do
3636
if math.abs(second-val)<0.02 then
3737
finalsecond = n[idx]
@@ -40,13 +40,13 @@ function SendProjectList()
4040
if finalsecond == nil then
4141
reaper.GetSet_LoopTimeRange(1, 0, 0, 0, 0)
4242
end
43-
44-
if finalfirst ~= finalsecond and finalfirst ~= nil and finalsecond ~= nil then
43+
44+
if finalfirst ~= finalsecond and finalfirst ~= nil and finalsecond ~= nil then
4545
reaper.SetExtState("Fanciest","SelectDisplay",finalfirst..':'..finalsecond,false)
4646
else
4747
reaper.SetExtState("Fanciest","SelectDisplay","none",false)
4848
end
49-
49+
5050
-- send track arm states
5151
count = reaper.CountTracks(0)
5252
local arms = {}
@@ -67,4 +67,4 @@ function SendProjectList()
6767
reaper.SetExtState("Fanciest","ArmDisplay",armstring,false)
6868
end
6969

70-
SendProjectList()
70+
ReadCurrentProject()

Web Interfaces/rxfx_Turing-complete/rxfx_Turing-complete - Save project as.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33

44
function SaveProjectAs()
55
local folder = reaper.GetExtState("Fanciest", "ProjectFolder")
6-
6+
77
local oldProject = reaper.GetProjectName(0):gsub(".RPP","")
88
local projectFile = reaper.GetExtState("Fanciest", "ProjectSave")
99
reaper.Main_SaveProjectEx(0, folder .. projectFile .. ".RPP", 8)
1010
local projectStorage = reaper.GetProjectName(0):gsub(".RPP","")
11-
11+
1212
reaper.GetSetProjectInfo_String(0, "RECORD_PATH", projectStorage, 1)
1313
--reaper.ShowConsoleMsg('\n\n'..oldProject..'vs'..projectStorage..'\n')
1414
os.execute('mkdir "'..folder..projectStorage..'"')
15-
15+
1616
-- move all recordings
1717
local numItems = reaper.CountMediaItems(0)
1818
for i=0,numItems-1 do
1919
local currentItem = reaper.GetMediaItem(0, i)
2020
local numTakes = reaper.GetMediaItemNumTakes(currentItem)
2121
for n=0,numTakes-1 do
2222
local currentTake = reaper.GetMediaItemTake(currentItem,n)
23-
--if currentTake == nil then
23+
--if currentTake == nil then
2424
if currentTake ~= nil then
2525
local currentSource = reaper.GetMediaItemTake_Source(currentTake)
2626
local currentFilename = reaper.GetMediaSourceFileName(currentSource):gsub(folder,'')
@@ -42,17 +42,17 @@ function SaveProjectAs()
4242
end
4343
end
4444
reaper.Main_SaveProject()
45-
45+
4646
--delete old project - not ideal but a missing files warning is currently unrecoverable
4747
if oldProject ~= projectStorage then
4848
if not os.remove(folder..oldProject) then
4949
os.rename(folder..oldProject,folder.."orphans_"..oldProject)
5050
end
5151
os.remove(folder..oldProject..'.RPP')
52+
os.remove(folder..oldProject..'.rpp')
5253
end
53-
54+
5455
--reaper.ShowConsoleMsg(reaper.GetProjectPath())
5556
end
5657

5758
SaveProjectAs()
58-
Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
-- @noindex
22

3-
4-
function GetProjectFolder()
5-
reaper.SetExtState("Fanciest","ProjectFolder","/home/flynn/Music/",true)
6-
end
7-
8-
-- GetProjectFolder()
9-
103
function SendProjectList()
114
local folder = reaper.GetExtState("Fanciest","ProjectFolder")
125
local ext = "rpp"
136
local files = {}
147
project_list = {}
15-
8+
169
local i = 0
1710
repeat
1811
local file = reaper.EnumerateFiles(folder, i)
@@ -21,7 +14,7 @@ function SendProjectList()
2114
end
2215
i = i + 1
2316
until not file
24-
17+
2518
-- files now contains all .rpp filenames in that folder
2619
for _, f in ipairs(files) do
2720
--reaper.ShowConsoleMsg(f .. "\n")
@@ -33,4 +26,3 @@ function SendProjectList()
3326
end
3427

3528
SendProjectList()
36-

Web Interfaces/rxfx_Turing-complete/rxfx_Turing-complete - Set time selection from markers.lua

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
-- @noindex
22

33

4-
function OpenSelectedProject()
4+
function SetTimeSelection()
55
values = reaper.GetExtState("Fanciest","MarkerLoop")
66
local t = {}
77
for str in string.gmatch(values, "([^:]+)") do
@@ -11,8 +11,8 @@ function OpenSelectedProject()
1111
for i=1, reaper.GetNumRegionsOrMarkers(0) do
1212
table.insert(ms, reaper.GetRegionOrMarkerInfo_Value(0, reaper.GetRegionOrMarker(0, i-1,""), "I_NUMBER"))
1313
end
14-
15-
14+
15+
1616
if t[1] == "home" then
1717
first = 0
1818
elseif t[1] == "end" then
@@ -40,8 +40,7 @@ function OpenSelectedProject()
4040
second = reaper.GetRegionOrMarkerInfo_Value(0, wip, "D_STARTPOS")
4141
end
4242
reaper.GetSet_LoopTimeRange(1, 0, first, second, true)
43-
44-
end
4543

46-
OpenSelectedProject()
44+
end
4745

46+
SetTimeSelection()

0 commit comments

Comments
 (0)