[mxbb-commits] mx_music/music_box/modules music_cat.php, 1.2, 1.3 music_media_cat.php, 1.2, 1.3 mus

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/mx_music/music_box/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30464/music_box/modules

Modified Files:
	music_cat.php music_media_cat.php music_page.php 
	music_pic_cat.php music_rss.php music_stream.php 
Log Message:


Index: music_pic_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_pic_cat.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** music_pic_cat.php	29 Jan 2008 07:51:05 -0000	1.2
--- music_pic_cat.php	8 Mar 2008 20:54:51 -0000	1.3
***************
*** 442,446 ****
  			if ( $thissong['song_imagename'] == '' )
  			{
! 				$img_id = $mx_images['no_image'];
  			}
  			else
--- 442,446 ----
  			if ( $thissong['song_imagename'] == '' )
  			{
! 				$img_id = $images['no_image'];
  			}
  			else
***************
*** 926,930 ****
  
  	'U_UPLOAD_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")),
! 	'UPLOAD_SONG_IMG' => $mx_images['upload_song'],
  	'L_UPLOAD_SONG' => $lang['Upload_Song'],
  
--- 926,930 ----
  
  	'U_UPLOAD_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")),
! 	'UPLOAD_SONG_IMG' => $images['upload_song'],
  	'L_UPLOAD_SONG' => $lang['Upload_Song'],
  

Index: music_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_cat.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** music_cat.php	29 Jan 2008 07:51:05 -0000	1.2
--- music_cat.php	8 Mar 2008 20:54:50 -0000	1.3
***************
*** 439,443 ****
  			if ( $thissong['song_imagename'] == '' )
  			{
! 				$img_id = $mx_images['no_image'];
  			}
  			else
--- 439,443 ----
  			if ( $thissong['song_imagename'] == '' )
  			{
! 				$img_id = $images['no_image'];
  			}
  			else
***************
*** 929,933 ****
  
  	'U_UPLOAD_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")),
! 	'UPLOAD_SONG_IMG' => $mx_images['upload_song'],
  	'L_UPLOAD_SONG' => $lang['Upload_Song'],
  
--- 929,933 ----
  
  	'U_UPLOAD_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")),
! 	'UPLOAD_SONG_IMG' => $images['upload_song'],
  	'L_UPLOAD_SONG' => $lang['Upload_Song'],
  

Index: music_stream.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_stream.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** music_stream.php	29 Jan 2008 07:51:05 -0000	1.2
--- music_stream.php	8 Mar 2008 20:54:51 -0000	1.3
***************
*** 174,194 ****
  */
  
! // Settings by lsn
! $host = explode("//", $thissong['song_url']);
! $host = $host[1];
! $host = explode(":", $host);
! $ip = $host[0];		// Shoutcast Ip or Host
  $port = explode("/", $host[1]);
- $port = $port[0];	// Shoutcast Port 	
- $mount = "/";				// Used for alternate path to "Streaming URL" -- leave as "/" for the default setup.
- $artist = "Shotcast Steam -via- Mx Music Center";
- $title = "Radio Steam - Mx Music Center!";
- $album = "Live";
  
! if ( $port == '' ) 
  { 
  	$port = '80';
  }
!  
  // Make socket connection
  $errno = "errno";
--- 174,235 ----
  */
  
! // Settings by lsn (hb...@ho...)
! $hostandport = explode("//", $thissong['song_url']);
! 
! //Trasfer Protocol
! if ($hostandport[0]) 
! { 
! 	$protocol_type = $hostandport[0];
! }
! else
! { 
! 	$protocol_type = 'http:';
! }
! 
! //Domain
! $hostname = $hostandport[1];
! 
! // Shoutcast Ip or Host
! $host = explode(":", $hostname);
! 
! if ($host[0]) 
! { 
! 	$ip = $host[0];
! }
! elseif ($hostname) 
! { 
! 	$ip = $hostname;
! }
! else
! { 
! 	$ip = '127.0.0.0'; //localhost
! }
! 
! // Shoutcast Port
  $port = explode("/", $host[1]);
  
! if ($port[0]) 
! { 
! 	$port = $port[0];
! }
! elseif ($host[1])
! { 
! 	$port = $host[1];
! }
! else
  { 
  	$port = '80';
  }
! 	 	
! $mount = "/";		// Used for alternate path to "Streaming URL" -- leave as "/" for the default setup.
! 
! $wmpmode = ($protocol_type == 'icyx:') ? 'icyx://' : 'http://';	// AAC VS MPEG
! $mimetype = ($protocol_type == 'icyx:') ? 'audio/aacp' : 'audio/x-mpeg';	// AAC VS MPEG
! 
! //Other
! $artist = "Shotcast Steam -via- Mx Music Center";
! $title = "Radio Steam - Mx Music Center!";
! $album = "Live";
! 
  // Make socket connection
  $errno = "errno";
***************
*** 199,203 ****
  // Establish response headers
  header("HTTP/1.0 200 OK");
! header("Content-Type: audio/x-mpeg, audio/x-mpeg-3, audio/mpeg3");
  header("Content-Transfer-Encoding: binary");
  
--- 240,244 ----
  // Establish response headers
  header("HTTP/1.0 200 OK");
! header("Content-Type: $mimetype, audio/x-mpeg-3, audio/mpeg3");
  header("Content-Transfer-Encoding: binary");
  
***************
*** 229,232 ****
--- 270,276 ----
  		echo $outData;
  	}
+ 	elseif (!stristr($outData, "icyx") && !stristr($outData, "content")){
+ 		echo $outData;
+ 	}
  
  }

Index: music_rss.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_rss.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** music_rss.php	29 Jan 2008 07:51:05 -0000	1.2
--- music_rss.php	8 Mar 2008 20:54:51 -0000	1.3
***************
*** 231,235 ****
  		if ( $thissong['song_imagename'] == '' )
  		{
! 			$img_id = $mx_images['no_image'];
  		}
  		else
--- 231,235 ----
  		if ( $thissong['song_imagename'] == '' )
  		{
! 			$img_id = $images['no_image'];
  		}
  		else

Index: music_media_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_media_cat.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** music_media_cat.php	29 Jan 2008 07:51:05 -0000	1.2
--- music_media_cat.php	8 Mar 2008 20:54:50 -0000	1.3
***************
*** 469,473 ****
  			if ( $thissong['song_imagename'] == '' )
  			{
! 				$img_id = $mx_images['no_image'];
  			}
  			else
--- 469,473 ----
  			if ( $thissong['song_imagename'] == '' )
  			{
! 				$img_id = $images['no_image'];
  			}
  			else
***************
*** 1198,1202 ****
  
  	'U_UPLOAD_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")),
! 	'UPLOAD_SONG_IMG' => $mx_images['upload_song'],
  	'L_UPLOAD_SONG' => $lang['Upload_Song'],
  
--- 1198,1202 ----
  
  	'U_UPLOAD_SONG' => mx_append_sid(this_mo_mxurl("music_mode=music_upload&cat_id=$cat_id")),
! 	'UPLOAD_SONG_IMG' => $images['upload_song'],
  	'L_UPLOAD_SONG' => $lang['Upload_Song'],
  

Index: music_page.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_page.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** music_page.php	29 Jan 2008 07:51:05 -0000	1.2
--- music_page.php	8 Mar 2008 20:54:50 -0000	1.3
***************
*** 33,37 ****
  $music_root_path = $module_root_path . 'music_box/';
  $song_image_path = MUSIC_IMAGE_PATH;
! $song_image_default = $mx_images['no_image'];  // The default image
  
  // ------------------------------------
--- 33,37 ----
  $music_root_path = $module_root_path . 'music_box/';
  $song_image_path = MUSIC_IMAGE_PATH;
! $song_image_default = $images['no_image'];  // The default image
  
  // ------------------------------------

[mxbb-commits] mx_music/music_box/modules music_cat.php, 1.2, 1.3 music_media_cat.php, 1.2, 1.3 mus

[mxbb-commits] mx_music/music_box/modules music_cat.php, 1.2, 1.3 music_media_cat.php, 1.2, 1.3 music_page.php, 1.2, 1.3 music_pic_cat.php, 1.2, 1.3 music_rss.php, 1.2, 1.3 music_stream.php, 1.2, 1.3