[mxbb-commits] mx_shotcast getinfo.php,1.6,1.7 play.php,1.2,1.3

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_shotcast
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31684

Modified Files:
	getinfo.php play.php 
Log Message:


Index: getinfo.php
===================================================================
RCS file: /cvsroot/mxbb/mx_shotcast/getinfo.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** getinfo.php	6 Mar 2008 03:09:28 -0000	1.6
--- getinfo.php	6 Mar 2008 04:59:09 -0000	1.7
***************
*** 465,469 ****
  
  $wmpmode = ($mimetype !== 'audio/aacp') ? 'http://' : 'icyx://';	// AAC VS MPEG
! $wmplist = ''; //($mimetype == 'audio/mpeg') ? '' : '/' . $playlist;
  
  $protocol_type = ($mimetype !== 'audio/aacp') ? 'http' : 'icyx';
--- 465,469 ----
  
  $wmpmode = ($mimetype !== 'audio/aacp') ? 'http://' : 'icyx://';	// AAC VS MPEG
! $wmplist = '/' . $playlist;
  
  $protocol_type = ($mimetype !== 'audio/aacp') ? 'http' : 'icyx';

Index: play.php
===================================================================
RCS file: /cvsroot/mxbb/mx_shotcast/play.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** play.php	6 Mar 2008 04:50:02 -0000	1.2
--- play.php	6 Mar 2008 04:59:09 -0000	1.3
***************
*** 77,83 ****
  ?>
  <OBJECT id="RVOCX" classid="CLSID:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA">
!  <PARAM name="SRC" value="http://<?=$radio->host;?>:<?=$radio->port;?><?=$playlist;?>">
   <PARAM name="autostart" value="true">
!   <EMBED autostart="true" src="http://<?=$radio->host;?>:<?=$radio->port;?><?=$playlist;?>" type="audio/x-pn-realaudio-plugin">
    </EMBED>
  </OBJECT>
--- 77,83 ----
  ?>
  <OBJECT id="RVOCX" classid="CLSID:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA">
!  <PARAM name="SRC" value="http://<?=$radio->host;?>:<?=$radio->port;?><?=$wmplist;?>">
   <PARAM name="autostart" value="true">
!   <EMBED autostart="true" src="http://<?=$radio->host;?>:<?=$radio->port;?><?=$wmplist;?>" type="audio/x-pn-realaudio-plugin">
    </EMBED>
  </OBJECT>
***************
*** 89,95 ****
  <OBJECT id="QuickTime" classid="CLSID:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" 
   codebase="http://www.apple.com/qtactivex/qtplugin.cab">
!  <PARAM name="SRC" value="http://<?=$radio->host;?>:<?=$radio->port;?><?=$playlist;?>">
   <PARAM name="AUTOPLAY" value="true">
!   <EMBED id="QuickTime" src="http://<?=$radio->host;?>:<?=$radio->port;?><?=$playlist;?>" type="audio/mpegurl" autoplay="true" 
     pluginspace="http://www.apple.com/quicktime/download/">
    </EMBED>
--- 89,95 ----
  <OBJECT id="QuickTime" classid="CLSID:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" 
   codebase="http://www.apple.com/qtactivex/qtplugin.cab">
!  <PARAM name="SRC" value="http://<?=$radio->host;?>:<?=$radio->port;?><?=$wmplist;?>">
   <PARAM name="AUTOPLAY" value="true">
!   <EMBED id="QuickTime" src="http://<?=$radio->host;?>:<?=$radio->port;?><?=$wmplist;?>" type="audio/mpegurl" autoplay="true" 
     pluginspace="http://www.apple.com/quicktime/download/">
    </EMBED>
***************
*** 145,149 ****
  		document.write (' standby="Loading Microsoft Windows Media Player components..."'); 
  		document.write (' TYPE="application/x-oleobject" width="250" height="62">');
! 		document.write (' <PARAM NAME="FileName" VALUE="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>" valuetype="ref">'); 
  		document.write ('<PARAM NAME="url" VALUE="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>"> '); 
  		document.write ('<PARAM NAME="AutoStart" VALUE="true">'); 
--- 145,149 ----
  		document.write (' standby="Loading Microsoft Windows Media Player components..."'); 
  		document.write (' TYPE="application/x-oleobject" width="250" height="62">');
! 		document.write (' <PARAM NAME="FileName" VALUE="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?>" valuetype="ref">'); 
  		document.write ('<PARAM NAME="url" VALUE="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>"> '); 
  		document.write ('<PARAM NAME="AutoStart" VALUE="true">'); 
***************
*** 153,158 ****
  		document.write ('    <Embed type="application/x-ms-wmp"');
  		document.write ('        pluginspage="<?=$ff2pluginspace;?>"');
! 		document.write ('        filename="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>"');
! 		document.write ('        src="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?><?=$wmplist;?>"');
  		document.write ('        Name=MediaPlayer');
  		document.write ('        ShowControls=1');
--- 153,158 ----
  		document.write ('    <Embed type="application/x-ms-wmp"');
  		document.write ('        pluginspage="<?=$ff2pluginspace;?>"');
! 		document.write ('        filename="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?>"');
! 		document.write ('        src="<?=$wmpmode;?><?=$scip;?>:<?=$scport;?>"');
  		document.write ('        Name=MediaPlayer');
  		document.write ('        ShowControls=1');