From d20290ad2f97078648ba7bce69e4203d4a6e319d Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Mon, 1 Jul 2013 21:00:52 -0400
Subject: [PATCH] More lua to fix.

---
 BackgroundEffects/Centered.lua                | 31 ++++---
 BackgroundEffects/Checkerboard1File2x2.lua    | 61 ++++++++++----
 BackgroundEffects/Checkerboard2File2x2.lua    | 84 ++++++++++++++-----
 BackgroundEffects/Checkerboard2x2.lua         | 43 ++++++++--
 BackgroundEffects/File1FlashOverlay.lua       | 18 +++-
 BackgroundEffects/File2Flash.lua              | 34 ++++++--
 BackgroundEffects/File2Normal.lua             | 32 +++++--
 BackgroundEffects/Kaleidoscope2x2.lua         | 62 ++++++++++----
 BackgroundEffects/OverlayAdd.lua              | 16 +++-
 BackgroundEffects/SongBgWithMovieViz.lua      | 63 ++++++++------
 BackgroundEffects/StretchNoLoop.lua           | 33 +++++---
 BackgroundEffects/StretchNormal.lua           | 42 +++++-----
 BackgroundEffects/StretchNormalAlignLeft.lua  | 34 +++++---
 BackgroundEffects/StretchNormalBlue.lua       | 34 +++++---
 BackgroundEffects/StretchNormalGreen.lua      | 34 +++++---
 BackgroundEffects/StretchNormalRed.lua        | 34 +++++---
 BackgroundEffects/StretchPaused.lua           | 33 +++++---
 BackgroundEffects/StretchRewind.lua           | 35 +++++---
 BackgroundEffects/UpperLeft.lua               | 33 +++++---
 BackgroundEffects/Visualization2File.lua      | 57 +++++++++----
 BackgroundEffects/Visualization2FileFlash.lua | 35 ++++++--
 21 files changed, 593 insertions(+), 255 deletions(-)

diff --git a/BackgroundEffects/Centered.lua b/BackgroundEffects/Centered.lua
index 5ee918a626..ef0cf4590a 100644
--- a/BackgroundEffects/Centered.lua
+++ b/BackgroundEffects/Centered.lua
@@ -1,11 +1,20 @@
-local Color1 = color(Var "Color1");
-
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,Color1;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
+local Color1 = color(Var "Color1");
+
+local t = Def.ActorFrame {
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:diffuse(Color1);
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/Checkerboard1File2x2.lua b/BackgroundEffects/Checkerboard1File2x2.lua
index 0d092febbe..e177362fce 100644
--- a/BackgroundEffects/Checkerboard1File2x2.lua
+++ b/BackgroundEffects/Checkerboard1File2x2.lua
@@ -1,16 +1,45 @@
-local Color1 = color(Var "Color1");
-
-local a = LoadActor(Var "File1") .. {
-	OnCommand=cmd(cropto,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color1;effectclock,"music");
-	GainFocusCommand=cmd(play);
-	LoseFocusCommand=cmd(pause);
-};
-
-local t = Def.ActorFrame {
-	a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-	a .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-	a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-	a .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-};
-
-return t;
+local Color1 = color(Var "Color1");
+
+local a = LoadActor(Var "File1") .. {
+	OnCommand=function(self)
+		self:cropto(SCREEN_WIDTH / 2);
+		self:zoomtoheight(SCREEN_HEIGHT / 2);
+		self:diffuse(Color1);
+		self:effectclock("music");
+	end;
+	GainFocusCommand=function(self)
+		self:play();
+	end;
+	LoseFocusCommand=function(self)
+		self:pause();
+	end;
+};
+
+local t = Def.ActorFrame {
+	a .. {
+		OnCommand = function(self)
+			self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+	a .. {
+		OnCommand = function(self)
+			self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+	a .. {
+		OnCommand = function(self)
+			self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+	a .. {
+		OnCommand = function(self)
+			self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/Checkerboard2File2x2.lua b/BackgroundEffects/Checkerboard2File2x2.lua
index 71d59e85da..a1b5689d86 100644
--- a/BackgroundEffects/Checkerboard2File2x2.lua
+++ b/BackgroundEffects/Checkerboard2File2x2.lua
@@ -1,23 +1,61 @@
-local Color1 = color(Var "Color1");
-local Color2 = color(Var "Color2");
-
-local a1 = LoadActor(Var "File1") .. {
-	OnCommand=cmd(cropto,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color1;effectclock,"music");
-	GainFocusCommand=cmd(play);
-	LoseFocusCommand=cmd(pause);
-};
-local a2 = LoadActor(Var "File2") .. {
-	OnCommand=cmd(cropto,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color2;effectclock,"music");
-	GainFocusCommand=cmd(play);
-	LoseFocusCommand=cmd(pause);
-};
-
-local t = Def.ActorFrame {
-	a1 .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-	a2 .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-	a2 .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-	a1 .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-};
-
-return t;
-
+local Color1 = color(Var "Color1");
+local Color2 = color(Var "Color2");
+
+local a1 = LoadActor(Var "File1") .. {
+	OnCommand=function(self)
+		self:cropto(SCREEN_WIDTH / 2);
+		self:zoomtoheight(SCREEN_HEIGHT / 2);
+		self:diffuse(Color1);
+		self:effectclock("music");
+	end;
+	GainFocusCommand=function(self)
+		self:play();
+	end;
+	LoseFocusCommand=function(self)
+		self:pause();
+	end;
+};
+local a2 = LoadActor(Var "File2") .. {
+	OnCommand=function(self)
+		self:cropto(SCREEN_WIDTH / 2);
+		self:zoomtoheight(SCREEN_HEIGHT / 2);
+		self:diffuse(Color2);
+		self:effectclock("music");
+	end;
+	GainFocusCommand=function(self)
+		self:play();
+	end;
+	LoseFocusCommand=function(self)
+		self:pause();
+	end;
+};
+
+local t = Def.ActorFrame {
+	a1 .. {
+		OnCommand = function(self)
+			self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+	a2 .. {
+		OnCommand = function(self)
+			self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+	a2 .. {
+		OnCommand = function(self)
+			self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+	a1 .. {
+		OnCommand = function(self)
+			self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+};
+
+return t;
+
diff --git a/BackgroundEffects/Checkerboard2x2.lua b/BackgroundEffects/Checkerboard2x2.lua
index f2463110cf..2882c53c27 100644
--- a/BackgroundEffects/Checkerboard2x2.lua
+++ b/BackgroundEffects/Checkerboard2x2.lua
@@ -1,9 +1,36 @@
--- Alternating files being played back at once
-local t = Def.ActorFrame {
-    LoadActor(Var "File1") .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
-    LoadActor(Var "File2") .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
-    LoadActor(Var "File2") .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
-    LoadActor(Var "File1") .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
-};
-
+-- Alternating files being played back at once
+local t = Def.ActorFrame {
+    LoadActor(Var "File1") .. { 
+		OnCommand = function(self)
+			self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+			self:cropto(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
+			self:rate(0.25);
+		end;
+	LoadActor(Var "File2") .. { 
+	OnCommand = function(self)
+			self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+			self:cropto(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
+			self:rate(0.25);
+		end;
+	};
+    LoadActor(Var "File2") .. { 
+	OnCommand = function(self)
+			self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+			self:cropto(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
+			self:rate(0.25);
+		end;
+	};
+    LoadActor(Var "File1") .. { 
+	OnCommand = function(self)
+			self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+			self:cropto(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
+			self:rate(0.25);
+		end;
+	};
+};
+
 return t
\ No newline at end of file
diff --git a/BackgroundEffects/File1FlashOverlay.lua b/BackgroundEffects/File1FlashOverlay.lua
index bf059a137d..2df48d4213 100644
--- a/BackgroundEffects/File1FlashOverlay.lua
+++ b/BackgroundEffects/File1FlashOverlay.lua
@@ -4,9 +4,21 @@ local Color2 = color(Var "Color2");
 local t = Def.ActorFrame {};
 
 t[#t+1] = LoadActor(Var "File1") .. {
-	OnCommand=cmd(diffuse,Color1;blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;linear,1;diffusealpha,0);
-	GainFocusCommand=cmd(play);
-	LoseFocusCommand=cmd(pause);
+	OnCommand=function(self)
+		self:diffuse(Color1);
+		self:blend("BlendMode_Add");
+		self:x(SCREEN_CENTER_X);
+		self:y(SCREEN_CENTER_Y);
+		self:scale_or_crop_background();
+		self:linear(1);
+		self:diffusealpha(0);
+	end;
+	GainFocusCommand=function(self)
+		self:play();
+	end;
+	LoseFocusCommand=function(self)
+		self:pause();
+	end;
 };
 
 return t;
diff --git a/BackgroundEffects/File2Flash.lua b/BackgroundEffects/File2Flash.lua
index dd98d708ff..ee78c5be34 100644
--- a/BackgroundEffects/File2Flash.lua
+++ b/BackgroundEffects/File2Flash.lua
@@ -4,16 +4,38 @@ local Color2 = color(Var "Color2");
 local t = Def.ActorFrame {};
 
 t[#t+1] = LoadActor(Var "File1") .. {
-	OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
-	GainFocusCommand=cmd(play);
-	LoseFocusCommand=cmd(pause);
+	OnCommand=function(self)
+		self:x(SCREEN_CENTER_X);
+		self:y(SCREEN_CENTER_Y);
+		self:scale_or_crop_background();
+		self:diffuse(Color1);
+		self:effectclock("music");
+	end;
+	GainFocusCommand=function(self)
+		self:play();
+	end;
+	LoseFocusCommand=function(self)
+		self:pause();
+	end;
 };
 
 if Var("File2") ~= nil then
 	t[#t+1] = LoadActor(Var("File2")) .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music";linear,1;diffusealpha,0);
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
+		OnCommand=function(self)
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scale_or_crop_background();
+			self:diffuse(Color2);
+			self:effectclock("music");
+			self:linear(1);
+			self:diffusealpha(0);
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
 	};
 end;
 
diff --git a/BackgroundEffects/File2Normal.lua b/BackgroundEffects/File2Normal.lua
index 318a36bee1..f844c7ffac 100644
--- a/BackgroundEffects/File2Normal.lua
+++ b/BackgroundEffects/File2Normal.lua
@@ -5,16 +5,36 @@ local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
 local t = Def.ActorFrame {};
 
 t[#t+1] = LoadActor(Var "File1") .. {
-	OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
-	GainFocusCommand=cmd(play);
-	LoseFocusCommand=cmd(pause);
+	OnCommand=function(self)
+		self:x(SCREEN_CENTER_X);
+		self:y(SCREEN_CENTER_Y);
+		self:scale_or_crop_background();
+		self:diffuse(Color1);
+		self:effectclock("music");
+	end;
+	GainFocusCommand=function(self)
+		self:play();
+	end;
+	LoseFocusCommand=function(self)
+		self:pause();
+	end;
 };
 
 if Var("File2") ~= nil then
 	t[#t+1] = LoadActor(Var("File2")) .. {
-	OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
-	GainFocusCommand=cmd(play);
-	LoseFocusCommand=cmd(pause);
+	OnCommand=function(self)
+		self:x(SCREEN_CENTER_X);
+		self:y(SCREEN_CENTER_Y);
+		self:scale_or_crop_background();
+		self:diffuse(Color2); -- originally Color1: assuming mistake.
+		self:effectclock("music");
+	end;
+	GainFocusCommand=function(self)
+		self:play();
+	end;
+	LoseFocusCommand=function(self)
+		self:pause();
+	end;
 	};
 end;
 
diff --git a/BackgroundEffects/Kaleidoscope2x2.lua b/BackgroundEffects/Kaleidoscope2x2.lua
index 834dd4f7a4..2fa60d1af6 100644
--- a/BackgroundEffects/Kaleidoscope2x2.lua
+++ b/BackgroundEffects/Kaleidoscope2x2.lua
@@ -1,16 +1,46 @@
-local Color1 = color(Var "Color1");
-
-local a = LoadActor(Var "File1") .. {
-	OnCommand=cmd(cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;diffuse,Color1;zoomx,self:GetZoomX()*-1;zoomy,self:GetZoomY()*-1;effectclock,"music");
-	GainFocusCommand=cmd(play);
-	LoseFocusCommand=cmd(pause);
-};
-
-local t = Def.ActorFrame {
-	a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-	a .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-	a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-	a .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
-};
-
-return t;
+local Color1 = color(Var "Color1");
+
+local a = LoadActor(Var "File1") .. {
+	OnCommand=function(self)
+		self:cropto(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
+		self:diffuse(Color1);
+		self:zoomx(self:GetZoomX() * -1);
+		self:zoomy(self:GetZoomY() * -1);
+		self:effectclock("music");
+	end;
+	GainFocusCommand=function(self)
+		self:play();
+	end;
+	LoseFocusCommand=function(self)
+		self:pause();
+	end;
+};
+
+local t = Def.ActorFrame {
+	a .. {
+		OnCommand = function(self)
+			self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+	a .. {
+		OnCommand = function(self)
+			self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+	a .. {
+		OnCommand = function(self)
+			self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+	a .. {
+		OnCommand = function(self)
+			self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
+			self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/OverlayAdd.lua b/BackgroundEffects/OverlayAdd.lua
index dd918ddda0..7f4b293244 100644
--- a/BackgroundEffects/OverlayAdd.lua
+++ b/BackgroundEffects/OverlayAdd.lua
@@ -3,9 +3,19 @@ local Color1 = color(Var "Color1");
 local t = Def.ActorFrame {};
 
 t[#t+1] = LoadActor(Var "File1") .. {
-	OnCommand=cmd(diffuse,Color1;blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;);
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
+	OnCommand=function(self)
+		self:diffuse(Color1);
+		self:blend("BlendMode_Add");
+		self:x(SCREEN_CENTER_X);
+		self:y(SCREEN_CENTER_Y);
+		self:scale_or_crop_background();
+	end;
+	GainFocusCommand=function(self)
+		self:play();
+	end;
+	LoseFocusCommand=function(self)
+		self:pause();
+	end;
 };
 
 return t;
diff --git a/BackgroundEffects/SongBgWithMovieViz.lua b/BackgroundEffects/SongBgWithMovieViz.lua
index a9597aa256..ee73b3da5d 100644
--- a/BackgroundEffects/SongBgWithMovieViz.lua
+++ b/BackgroundEffects/SongBgWithMovieViz.lua
@@ -1,25 +1,38 @@
-local Color1 = color(Var "Color1");
-local Color2 = color(Var "Color2");
-local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
-
-local t = Def.ActorFrame {
-	Def.Sprite {
-		OnCommand=function(self)
-			self:LoadFromCurrentSongBackground()
-			self:xy(SCREEN_CENTER_X,SCREEN_CENTER_Y)
-			if stretchBG then self:SetSize(SCREEN_WIDTH,SCREEN_HEIGHT)
-			else self:scale_or_crop_background();
-			end
-			self:diffuse(Color1)
-			self:effectclock("music")
-		end;
-	};
-
-	LoadActor(Var "File1") .. {
-		OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
+local Color1 = color(Var "Color1");
+local Color2 = color(Var "Color2");
+local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
+
+local t = Def.ActorFrame {
+	Def.Sprite {
+		OnCommand=function(self)
+			self:LoadFromCurrentSongBackground()
+			self:xy(SCREEN_CENTER_X,SCREEN_CENTER_Y)
+			if stretchBG then
+				self:SetSize(SCREEN_WIDTH,SCREEN_HEIGHT)
+			else
+				self:scale_or_crop_background();
+			end
+			self:diffuse(Color1)
+			self:effectclock("music")
+		end;
+	};
+
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:blend("BlendMode_Add");
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scale_or_crop_background();
+			self:diffuse(Color2);
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/StretchNoLoop.lua b/BackgroundEffects/StretchNoLoop.lua
index c48fe01b0a..4edebb29d6 100644
--- a/BackgroundEffects/StretchNoLoop.lua
+++ b/BackgroundEffects/StretchNoLoop.lua
@@ -1,11 +1,22 @@
-local Color1 = color(Var "Color1");
-
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;loop,false;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
+local Color1 = color(Var "Color1");
+
+local t = Def.ActorFrame {
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scale_or_crop_background();
+			self:diffuse(Color1);
+			self:loop(false);
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/StretchNormal.lua b/BackgroundEffects/StretchNormal.lua
index 0edf91f0f1..d95718281b 100644
--- a/BackgroundEffects/StretchNormal.lua
+++ b/BackgroundEffects/StretchNormal.lua
@@ -1,19 +1,23 @@
-local Color1 = color(Var "Color1");
-local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
-
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand=function(self)
-			self:xy(SCREEN_CENTER_X,SCREEN_CENTER_Y)
-			if stretchBG then self:SetSize(SCREEN_WIDTH,SCREEN_HEIGHT)
-			else self:scale_or_crop_background();
-			end
-			self:diffuse(Color1)
-			self:effectclock("music")
-		end;
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
+local Color1 = color(Var "Color1");
+local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
+
+local t = Def.ActorFrame {
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:xy(SCREEN_CENTER_X,SCREEN_CENTER_Y)
+			if stretchBG then self:SetSize(SCREEN_WIDTH,SCREEN_HEIGHT)
+			else self:scale_or_crop_background();
+			end
+			self:diffuse(Color1)
+			self:effectclock("music")
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/StretchNormalAlignLeft.lua b/BackgroundEffects/StretchNormalAlignLeft.lua
index b145ef69d2..cc028423e0 100644
--- a/BackgroundEffects/StretchNormalAlignLeft.lua
+++ b/BackgroundEffects/StretchNormalAlignLeft.lua
@@ -1,12 +1,22 @@
--- Align left when cropping to 4:3.
-local Color1 = color(Var "Color1");
-
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
+-- Align left when cropping to 4:3.
+local Color1 = color(Var "Color1");
+
+local t = Def.ActorFrame {
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scale_or_crop_background();
+			self:diffuse(Color1);
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/StretchNormalBlue.lua b/BackgroundEffects/StretchNormalBlue.lua
index b5b7c629fb..0d7f1a4a86 100644
--- a/BackgroundEffects/StretchNormalBlue.lua
+++ b/BackgroundEffects/StretchNormalBlue.lua
@@ -1,12 +1,22 @@
--- Stretch a file with blue diffusion.
-local Color1 = color("0,0,1,1");
-
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
+-- Stretch a file with blue diffusion.
+local Color1 = color("0,0,1,1");
+
+local t = Def.ActorFrame {
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scale_or_crop_background();
+			self:diffuse(Color1);
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/StretchNormalGreen.lua b/BackgroundEffects/StretchNormalGreen.lua
index f90436b90f..2e5c0a0afc 100644
--- a/BackgroundEffects/StretchNormalGreen.lua
+++ b/BackgroundEffects/StretchNormalGreen.lua
@@ -1,12 +1,22 @@
---- Stretch a file with green diffusion.
-local Color1 = color("0,1,0,1");
-
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
+--- Stretch a file with green diffusion.
+local Color1 = color("0,1,0,1");
+
+local t = Def.ActorFrame {
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scale_or_crop_background();
+			self:diffuse(Color1);
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/StretchNormalRed.lua b/BackgroundEffects/StretchNormalRed.lua
index caa8ccbfa9..f933924fd3 100644
--- a/BackgroundEffects/StretchNormalRed.lua
+++ b/BackgroundEffects/StretchNormalRed.lua
@@ -1,12 +1,22 @@
---- Stretch a file with red diffusion.
-local Color1 = color("1,0,0,1");
-
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
+--- Stretch a file with red diffusion.
+local Color1 = color("1,0,0,1");
+
+local t = Def.ActorFrame {
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scale_or_crop_background();
+			self:diffuse(Color1);
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/StretchPaused.lua b/BackgroundEffects/StretchPaused.lua
index 41c81bdd52..9b77ba0b15 100644
--- a/BackgroundEffects/StretchPaused.lua
+++ b/BackgroundEffects/StretchPaused.lua
@@ -1,11 +1,22 @@
-local Color1 = color(Var "Color1");
-
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;pause;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
+local Color1 = color(Var "Color1");
+
+local t = Def.ActorFrame {
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scale_or_crop_background();
+			self:diffuse(Color1);
+			self:pause();
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/StretchRewind.lua b/BackgroundEffects/StretchRewind.lua
index 05778de7ce..100406b6c5 100644
--- a/BackgroundEffects/StretchRewind.lua
+++ b/BackgroundEffects/StretchRewind.lua
@@ -1,12 +1,23 @@
-local Color = color(Var "Color1");
-
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;position,0;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
-
+local Color = color(Var "Color1");
+
+local t = Def.ActorFrame {
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scale_or_crop_background();
+			self:diffuse(Color1);
+			self:position(0);
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
+
diff --git a/BackgroundEffects/UpperLeft.lua b/BackgroundEffects/UpperLeft.lua
index 0987f8f1c4..db11147370 100644
--- a/BackgroundEffects/UpperLeft.lua
+++ b/BackgroundEffects/UpperLeft.lua
@@ -1,13 +1,20 @@
--- upper left corner
-local Color1 = color(Var "Color1");
-
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand=cmd(diffuse,Color1;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
-
+-- upper left corner
+local Color1 = color(Var "Color1");
+
+local t = Def.ActorFrame {
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:diffuse(Color1);
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
+
diff --git a/BackgroundEffects/Visualization2File.lua b/BackgroundEffects/Visualization2File.lua
index c729ed7b9d..be0f19155d 100644
--- a/BackgroundEffects/Visualization2File.lua
+++ b/BackgroundEffects/Visualization2File.lua
@@ -1,18 +1,39 @@
-local Color1 = color(Var "Color1");
-local Color2 = color(Var "Color2");
-
-local t = Def.ActorFrame {
-	LoadActor(Var "File1") .. {
-		OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-
-	LoadActor(Var "File2") .. {
-		OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color2;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
-	};
-};
-
-return t;
+local Color1 = color(Var "Color1");
+local Color2 = color(Var "Color2");
+
+local t = Def.ActorFrame {
+	LoadActor(Var "File1") .. {
+		OnCommand=function(self)
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scale_or_crop_background();
+			self:diffuse(Color1);
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+
+	LoadActor(Var "File2") .. {
+		OnCommand=function(self)
+			self:blend("BlendMode_Add");
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scaletoclipped(SCREEN_WIDTH, SCREEN_HEIGHT);
+			self:diffuse(Color2);
+			self:effectclock("music");
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
+	};
+};
+
+return t;
diff --git a/BackgroundEffects/Visualization2FileFlash.lua b/BackgroundEffects/Visualization2FileFlash.lua
index 9bc9f3e13f..92048ac18d 100644
--- a/BackgroundEffects/Visualization2FileFlash.lua
+++ b/BackgroundEffects/Visualization2FileFlash.lua
@@ -4,16 +4,39 @@ local Color2 = color(Var "Color2");
 local t = Def.ActorFrame {};
 
 t[#t+1] = LoadActor(Var "File1") .. {
-	OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
+	OnCommand=function(self)
+		self:x(SCREEN_CENTER_X);
+		self:y(SCREEN_CENTER_Y);
+		self:scale_or_crop_background();
+		self:diffuse(Color1);
+		self:effectclock("music");
+	end;
+	GainFocusCommand=function(self)
+		self:play();
+	end;
+	LoseFocusCommand=function(self)
+		self:pause();
+	end;
 };
 
 if Var("File2") ~= nil then
 	t[#t+1] = LoadActor(Var("File2")) .. {
-		OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music";linear,1;diffusealpha,0);
-		GainFocusCommand=cmd(play);
-		LoseFocusCommand=cmd(pause);
+		OnCommand=function(self)
+			self:blend("BlendMode_Add");
+			self:x(SCREEN_CENTER_X);
+			self:y(SCREEN_CENTER_Y);
+			self:scale_or_crop_background();
+			self:diffuse(Color2);
+			self:effectclock("music");
+			self:linear(1);
+			self:diffusealpha(0);
+		end;
+		GainFocusCommand=function(self)
+			self:play();
+		end;
+		LoseFocusCommand=function(self)
+			self:pause();
+		end;
 	};
 end;