internetradio: small tweaks

jlillis · Jul 17, 2024 · 8ffc446 · 8ffc446
1 parent 3dd5cbd
commit 8ffc446
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/[gameplay]/internetradio/config/ShRadioConfig.lua b/[gameplay]/internetradio/config/ShRadioConfig.lua
@@ -4,11 +4,11 @@
 -- ## Version: 1.0						##
 -- #######################################
 
-RADIO_CREATE_SPEAKER_DELAY = 3000
+RADIO_CREATE_SPEAKER_DELAY = 1000
 RADIO_TOGGLE_SPEAKER_DELAY = 1500
 RADIO_DESTROY_SPEAKER_DELAY = 1500
 RADIO_ALLOW_CUSTOM_URLS = true
-RADIO_STREAM_URL_MAX_LENGTH = 512
+RADIO_STREAM_URL_MAX_LENGTH = 1024 -- Accomodate long .mp3 CDN URLs from certain YT converter sites
 RADIO_MAX_SOUND_DISTANCE = 65
 RADIO_STATIONS = {
 	{"[Top 40 Mix] BAYERN Radio - Top40", "http://stream.antenne.de:80/top-40"},
@@ -95,4 +95,4 @@ RADIO_STATIONS = {
 	{"[Summer96] RadioRecord", "https://radiorecord.hostingradio.ru/summerparty96.aacp"},
 	{"[Dance] BAYERN Radio - Dance XXL", "http://stream.antenne.de:80/dance-xxl"},
 	{"[Dance] FunX Dance", "https://icecast.omroep.nl/funx-dance-bb-mp3"},
-}
+}
diff --git a/[gameplay]/internetradio/gui/CRadioGUI.lua b/[gameplay]/internetradio/gui/CRadioGUI.lua
@@ -13,7 +13,7 @@ local function initializeRadioGUI()
 
 	local screenX, screenY = guiGetScreenSize()
 	local radioWindowSizeX, radioWindowSizeY = 325, 380
-	local radioWindowPosX, radioWindowPosY = (screenX - 325)/1.1, (screenY - 380)/1.4
+	local radioWindowPosX, radioWindowPosY = (screenX - 325) / 1.1, (screenY - 380) / 1.4
 	local allowRemoteSpeakers = getRadioSetting("allowRemoteSpeakers")
 
 	RADIO_GUI = {}

diff --git a/[gameplay]/internetradio/handle_radio/CHandleRadio.lua b/[gameplay]/internetradio/handle_radio/CHandleRadio.lua
@@ -328,4 +328,4 @@ function clearSpeakersOnDestroyQuit()
 	clearPlayerSpeaker(source)
 end
 addEventHandler("onClientPlayerQuit", root, clearSpeakersOnDestroyQuit)
-addEventHandler("onClientElementDestroy", resourceRoot, clearSpeakersOnDestroyQuit)
+addEventHandler("onClientElementDestroy", resourceRoot, clearSpeakersOnDestroyQuit)
diff --git a/[gameplay]/internetradio/handle_radio/SHandleRadio.lua b/[gameplay]/internetradio/handle_radio/SHandleRadio.lua
@@ -203,7 +203,11 @@ function destroyAttachedRadioOnVehicleExplodeOrDestroy()
 		local attachedElementObject = (attachedElementType == "object")
 
 		if (attachedElementObject) then
-			clearPlayerSpeaker(attachedElement)
+			local boxFound = clearPlayerSpeaker(attachedElement)
+
+			if (boxFound) then
+				break
+			end
 		end
 	end
 end

diff --git a/[gameplay]/internetradio/track_name/CRadioTrackName.lua b/[gameplay]/internetradio/track_name/CRadioTrackName.lua
@@ -14,7 +14,6 @@ local function toggleSpeakerTrackRender()
 	local toggleOn = next(NEARBY_SPEAKERS)
 
 	if (toggleOn) then
-
 		if (speakerTrackRender) then
 			return false
 		end
@@ -26,7 +25,6 @@ local function toggleSpeakerTrackRender()
 	end
 
 	if (not toggleOn) then
-
 		if (not speakerTrackRender) then
 			return false
 		end
@@ -102,7 +100,7 @@ function onClientRenderRadioTrackName()
 
 			if (screenX and screenY) then
 				local textWidth = dxGetTextWidth(trackName, RADIO_TRACK_SCALE, RADIO_TRACK_FONT, trackNameColorCoded)
-				local textPosX = (screenX - textWidth/2)
+				local textPosX = (screenX - textWidth / 2)
 				local textBackgroundPosX = (textPosX - 5)
 				local textBackgroundPosY = (textWidth + 8)