itunes dll for windows now playing now supports StreamTitles (Fixes issue 1719)

FreeBSD 6 and 7 can now download and install a JRE. (Fixes issue 1722)
Launcher and Installer now source the ~/.profile file when looking for java.
Correct some java error messages in the installer

(All backported to 0.6 branch aswell)


git-svn-id: http://svn.dmdirc.com/branches/0.6@4620 00569f92-eb28-0410-84fd-f71c24880f

installer/linux/getjre.sh

@@ -109,11 +109,16 @@ questiondialog() {
 # Get the JRE.
 ARCH=`uname -m`
 ISAINFO=`which isainfo`
+ISFREEBSD=`uname -s | grep -i FreeBSD`
 if [ "${ISAINFO}" != "" ]; then
 	# Solaris-ish
 	ARCH=`uname -p`
 fi;
 URL="http://www.dmdirc.com/getjava/`uname -s`/${ARCH}"
+if [ "${ISFREEBSD}" != "" ]; then
+	RELEASE=`uname -r`
+	URL="${URL}/${RELEASE}"
+fi;
 
 WGET=`which wget`
 FETCH=`which fetch`
@@ -166,12 +171,12 @@ else
 	result=$?
 fi;
 if [ $result -eq 0 ]; then
-	PIPE=`mktemp -p ${PWD} progresspipe.XXXXXXXXXXXXXX`
+	PIPE=`mktemp progresspipe.XXXXXXXXXXXXXX`
 	if [ "${WGET}" != "" ]; then
 		${WGET} -q -O jre.bin ${URL} &
 		wgetpid=${!}
 	elif [ "${FETCH}" != "" ]; then
-		${FETCH} -q -o jre.bin &
+		${FETCH} -q -o jre.bin ${URL} &
 		wgetpid=${!}
 	elif [ "${CURL}" != "" ]; then
 		${CURL} -s -o jre.bin ${URL} &
@@ -190,8 +195,10 @@ if [ $result -eq 0 ]; then
 		fi;
 	done;
 	wgetpid=""
-#	echo "Killing progressbar"
-#	kill ${progressbarpid}
+	if [ "${ISFREEBSD}" != "" ]; then
+		echo "Killing progressbar"
+		kill ${progressbarpid}
+	fi;
 	messagedialog "Download Completed" "Download Completed"
 	if [ -e ${PIPE} ]; then
 		echo "Deleting Pipe ${PIPE}"

installer/linux/installjre.sh

@@ -51,6 +51,8 @@ if [ "${PIDOF}" = "" ]; then
 	fi;
 fi;
 
+ISFREEBSD=`uname -s | grep -i FreeBSD`
+
 ## Helper Functions
 if [ "${PIDOF}" != "" ]; then
 	ISKDE=`${PIDOF} -x -s kdeinit`
@@ -124,17 +126,34 @@ questiondialog() {
 
 showLicense() {
 	# Get License Text
-	FILE=`mktemp -p ${PWD} license.XXXXXXXXXXXXXX`
-	
-	# Location of license start
-	STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
-	STARTLINE=$((${STARTLINE%%:*} + 1))
-	# Location of license end
-	ENDLINE=`grep ${GREPOPTS} "Do you agree to the above license terms?" jre.bin`
-	ENDLINE=$((${ENDLINE%%:*} - 2))
-	
-	head -n ${ENDLINE} jre.bin | tail ${TAILOPTS}${STARTLINE} > ${FILE}
-	
+	FILE=`mktemp license.XXXXXXXXXXXXXX`
+	if [ "${ISFREEBSD}" != "" ]; then
+		WGET=`which wget`
+		FETCH=`which fetch`
+		CURL=`which curl`
+		
+		ARCH=`uname -m`
+		RELEASE=`uname -r`
+		URL="http://www.dmdirc.com/getjavalicense/`uname -s`/${ARCH}/${RELEASE}"
+		
+		if [ "${WGET}" != "" ]; then
+			${WGET} -q -O ${FILE} ${URL}
+		elif [ "${FETCH}" != "" ]; then
+			${FETCH} -q -o ${FILE} ${URL}
+		elif [ "${CURL}" != "" ]; then
+			${CURL} -s -o ${FILE} ${URL}
+		fi;
+	else
+		# Location of license start
+		STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
+		STARTLINE=$((${STARTLINE%%:*} + 1))
+		# Location of license end
+		ENDLINE=`grep ${GREPOPTS} "Do you agree to the above license terms?" jre.bin`
+		ENDLINE=$((${ENDLINE%%:*} - 2))
+		
+		head -n ${ENDLINE} jre.bin | tail ${TAILOPTS}${STARTLINE} > ${FILE}
+	fi;
+
 	# Send text to console.
 	echo ""
 	echo "-----------------------------------------------------------------------"
@@ -169,9 +188,13 @@ messagedialog "Java Install" "Before java can be installed, please review the fo
 showLicense
 questiondialog "Java Install" "Do you agree to the Java License?"
 if [ $? -eq 0 ]; then
-	# Look to see where the JRE wants to install to
-	JREJAVAHOME=`grep ${GREPOPTS} "^javahome=" jre.bin`
- 	JREJAVAHOME=${JREJAVAHOME##*=}
+	if [ "${ISFREEBSD}" != "" ]; then
+		JREJAVAHOME="diablo-jre1.6.0_07"
+	else
+		# Look to see where the JRE wants to install to
+		JREJAVAHOME=`grep ${GREPOPTS} "^javahome=" jre.bin`
+		JREJAVAHOME=${JREJAVAHOME##*=}
+	fi;
 	
 	echo "JREJAVAHOME: ${JREJAVAHOME}"
 	
@@ -188,33 +211,40 @@ if [ $? -eq 0 ]; then
 	echo "installdir: ${installdir}"
 	
 	if [ ! -e ${installdir} ]; then
-		# Hack jre.bin to allow us to install without asking for a license, or failing
-		# the checksum.
+		messagedialog "Java Install" "Java install will begin when you press OK.\nThis may take some time, so please wait.\n\nYou will be informed when the installation is completed."
+		if [ "${ISFREEBSD}" != "" ]; then
+			mv jre.bin jre.tar.bz2
+			tar -jxvf jre.tar.bz2
+			mv jre.tar.bz2 jre.bin
+		else
+			# Hack jre.bin to allow us to install without asking for a license, or failing
+			# the checksum.
+			
+			# Location of license start
+			STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
+			STARTLINE=${STARTLINE%%:*}
+			# Location of license end
+			ENDLINE=`grep ${GREPOPTS} "If you don't agree to the license you can't install this software" jre.bin`
+			ENDLINE=$((${ENDLINE%%:*} + 3))
+			# Location of checksum start
+			CSSTARTLINE=`grep ${GREPOPTS} "^if \[ -x /usr/bin/sum \]; then$" jre.bin`
+			CSSTARTLINE=${CSSTARTLINE%%:*}
+			# Location of checksum end
+			CSENDLINE=`grep ${GREPOPTS} "Can't find /usr/bin/sum to do checksum" jre.bin`
+			CSENDLINE=$((${CSENDLINE%%:*} + 2))
+			# Location of script end
+			SCENDLINE=`grep ${GREPOPTS} "^echo \"Done.\"$" jre.bin`
+			SCENDLINE=$((${SCENDLINE%%:*} + 2 - (${ENDLINE} - ${STARTLINE}) - (${CSENDLINE} - ${CSSTARTLINE})))
+			# Remove the license and checksum stuff!
+			head -n $((${STARTLINE} -1)) jre.bin > jre.bin.tmp
+			tail ${TAILOPTS}$((${ENDLINE})) jre.bin | head -n $((${CSSTARTLINE} -1 - ${ENDLINE})) >> jre.bin.tmp
+			echo "tail \${tail_args} +${SCENDLINE} \"\$0\" > \$outname" >> jre.bin.tmp
+			tail ${TAILOPTS}$((${CSENDLINE})) jre.bin >> jre.bin.tmp
 		
-		# Location of license start
-		STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
-		STARTLINE=${STARTLINE%%:*}
-		# Location of license end
-		ENDLINE=`grep ${GREPOPTS} "If you don't agree to the license you can't install this software" jre.bin`
-		ENDLINE=$((${ENDLINE%%:*} + 3))
-		# Location of checksum start
-		CSSTARTLINE=`grep ${GREPOPTS} "^if \[ -x /usr/bin/sum \]; then$" jre.bin`
-		CSSTARTLINE=${CSSTARTLINE%%:*}
-		# Location of checksum end
-		CSENDLINE=`grep ${GREPOPTS} "Can't find /usr/bin/sum to do checksum" jre.bin`
-		CSENDLINE=$((${CSENDLINE%%:*} + 2))
-		# Location of script end
-		SCENDLINE=`grep ${GREPOPTS} "^echo \"Done.\"$" jre.bin`
-		SCENDLINE=$((${SCENDLINE%%:*} + 2 - (${ENDLINE} - ${STARTLINE}) - (${CSENDLINE} - ${CSSTARTLINE})))
-		# Remove the license and checksum stuff!
-		head -n $((${STARTLINE} -1)) jre.bin > jre.bin.tmp
-		tail ${TAILOPTS}$((${ENDLINE})) jre.bin | head -n $((${CSSTARTLINE} -1 - ${ENDLINE})) >> jre.bin.tmp
-		echo "tail \${tail_args} +${SCENDLINE} \"\$0\" > \$outname" >> jre.bin.tmp
-		tail ${TAILOPTS}$((${CSENDLINE})) jre.bin >> jre.bin.tmp
+			yes | sh jre.bin.tmp
+			rm -Rf jre.bin.tmp
+		fi;
 		
-		messagedialog "Java Install" "Java install will begin when you press OK.\nThis may take some time, so please wait.\n\nYou will be informed when the installation is completed."
-		yes | sh jre.bin.tmp
-		rm -Rf jre.bin.tmp
 		mv ${JREJAVAHOME} ${installdir}
 		
 		if [ "0" = "${UID}" ]; then
@@ -230,13 +260,12 @@ if [ $? -eq 0 ]; then
 			ln -s ${installdir}/bin/java ${PWD}/java-bin
 		else
 			# Add to path.
-			if [ -e ${HOME}/.profile ]; then
-				echo "" >> ${HOME}/.profile
-				echo "# set PATH so it includes user's private java if it exists" >> ${HOME}/.profile
-				echo "if [ -d ~/${JREJAVAHOME}/bin ] ; then" >> ${HOME}/.profile
-				echo "	PATH=~/${JREJAVAHOME}/bin:\${PATH}" >> ${HOME}/.profile
-				echo "fi" >> ${HOME}/.profile
-			fi
+			echo "" >> ${HOME}/.profile
+			echo "# set PATH so it includes user's private java if it exists" >> ${HOME}/.profile
+			echo "if [ -d ~/${JREJAVAHOME}/bin ] ; then" >> ${HOME}/.profile
+			echo "	PATH=~/${JREJAVAHOME}/bin:\${PATH}" >> ${HOME}/.profile
+			echo "fi" >> ${HOME}/.profile
+			
 			if [ -e ${HOME}/.cshrc ]; then
 				echo "" >> ${HOME}/.cshrc
 				echo "# set PATH so it includes user's private java if it exists" >> ${HOME}/.cshrc

installer/linux/setup.sh

@@ -124,16 +124,25 @@ echo -n "Looking for java.. ";
 # check it first, because it isn't added to the path automatically
 JAVA="/usr/local/jdk1.6.0/jre/bin/java"
 if [ ! -e "${JAVA}" ]; then
-	JAVA=`which java`
+	# Try alternative BSD Location
+	JAVA="/usr/local/diablo-jdk1.6.0/jre/bin/java"
+	if [ ! -e "${JAVA}" ]; then
+		# Look in path
+		if [ -e "${HOME}/.profile" ]; then
+				# Source the profile incase java can't be found otherwise
+			. ${HOME}/.profile
+		fi;
+		JAVA=`which java`
+	fi
 fi
 
 installjre() {
 	result=1
 	if [ ! -e "jre.bin" ]; then
 		message="Would you like to download and install java?"
-		if [ "install" != "${1}" ]; then
+		if [ "install" = "${1}" ]; then
 			message="Java was not detected on your machine. Would you like to download and install it now?" 
-		elif [ "upgrade" != "${1}" ]; then
+		elif [ "upgrade" = "${1}" ]; then
 			message="The version of java detected on your machine is not compatible with DMDirc. Would you like to download and install a compatible version now?"
 		fi;
 		/bin/sh getjre.sh "${message}"
@@ -143,9 +152,9 @@ installjre() {
 		fi;
 	else
 		message="Would you like to install java?"
-		if [ "install" != "${1}" ]; then
+		if [ "install" = "${1}" ]; then
 			message="Java was not detected on your machine. Would you like to install it now?" 
-		elif [ "upgrade" != "${1}" ]; then
+		elif [ "upgrade" = "${1}" ]; then
 			message="The version of java detected on your machine is not compatible with DMDirc. Would you like to install a compatible version now?"
 		fi;
 		/bin/sh installjre.sh  "${message}"

launcher/linux/DMDirc.sh

@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-LAUNCHERVERSION="5"
+LAUNCHERVERSION="6"
 
 params=""
 
@@ -241,10 +241,20 @@ else
 fi;
 
 echo -n "Looking for java - ";
-# Check for BSD Ports version of java first as its not always in the path
+# Location where ports on FreeBSD/PCBSD installs java6
+# check it first, because it isn't added to the path automatically
 JAVA="/usr/local/jdk1.6.0/jre/bin/java"
 if [ ! -e "${JAVA}" ]; then
-	JAVA=`which java`
+	# Try alternative BSD Location
+	JAVA="/usr/local/diablo-jdk1.6.0/jre/bin/java"
+	if [ ! -e "${JAVA}" ]; then
+		# Look in path
+		if [ -e "${HOME}/.profile" ]; then
+			# Source the profile incase java can't be found otherwise
+			. ${HOME}/.profile
+		fi;
+		JAVA=`which java`
+	fi
 fi
 
 if [ "" != "${JAVA}" ]; then

src/com/dmdirc/addons/mediasource_windows/files/itunes.dpr

@@ -108,12 +108,20 @@ function getTitle(data: PChar):integer; stdcall;
 var
 	V: Variant;
 	B: array[0..255] of char;
+	kind: Integer;
 begin
   result := 1;
 	try
 		V := getITunes();
 		V := callOLEFunction(V, 'CurrentTrack');
-		B := String(callOLEFunction(V, 'Name'));
+		kind := callOLEFunction(V, 'Kind');
+		if kind = 3 then begin
+			V := getITunes();
+			B := String(callOLEFunction(V, 'CurrentStreamTitle'));
+		end
+		else begin
+			B := String(callOLEFunction(V, 'Name'));
+		end;
 		result := 0;
 	except
 		on E : Exception do B:= 'Unable to find iTunes Application ('+E.ClassName+'/'+E.Message+')';