move function from 02 sound to 02 actor; small edit to 02 optionsmenu

2011-09-26 14:28:52 -05:00
parent a7d69d791b
commit ca120fdba7
3 changed files with 7 additions and 35 deletions
@@ -214,6 +214,13 @@ function HelpDisplay:setfromsongorcourse()
 	self:settips( Artists, AltArtists )
 end

+-- Play the sound on the given player's side. Must set SupportPan = true
+-- on load.
+function ActorSound:playforplayer(pn)
+	local fBalance = SOUND:GetPlayerBalance(pn)
+	self:get():SetProperty("Pan", fBalance)
+	self:play()
+end

 -- (c) 2006 Glenn Maynard
 -- All rights reserved.
@@ -72,7 +72,6 @@ function OptionsRandomJukebox()

 	local t = 
 	{
-		-- Name is used to retrieve the header and explanation text.
 		Name = "OptionsRandomJukebox",
 		LayoutType = "ShowAllInRow",
 		SelectType = "SelectOne",
@@ -118,4 +117,3 @@ end
 -- OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 -- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 -- PERFORMANCE OF THIS SOFTWARE.
-
@@ -1,33 +0,0 @@
-- Can this be moved into some other file? Feels like clutter. -shake
-
-- Play the sound on the given player's side. Must set SupportPan = true
-- on load.
-function ActorSound:playforplayer(pn)
-	local fBalance = SOUND:GetPlayerBalance(pn)
-	self:get():SetProperty("Pan", fBalance)
-	self:play()
-end
-
-- (c) 2007 Glenn Maynard
-- All rights reserved.
-- 
-- Permission is hereby granted, free of charge, to any person obtaining a
-- copy of this software and associated documentation files (the
-- "Software"), to deal in the Software without restriction, including
-- without limitation the rights to use, copy, modify, merge, publish,
-- distribute, and/or sell copies of the Software, and to permit persons to
-- whom the Software is furnished to do so, provided that the above
-- copyright notice(s) and this permission notice appear in all copies of
-- the Software and that both the above copyright notice(s) and this
-- permission notice appear in supporting documentation.
-- 
-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-- THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-- INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
-- OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-- OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-- PERFORMANCE OF THIS SOFTWARE.
-