[mxbb-commits] mx_music/music_box/modules music_cat.php, 1.14, 1.15 music_page.php, 1.15, 1.16

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/mx_music/music_box/modules
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5063

Modified Files:
	music_cat.php music_page.php 
Log Message:


Index: music_page.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_page.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** music_page.php	21 Aug 2010 00:28:12 -0000	1.15
--- music_page.php	5 Jan 2011 00:00:03 -0000	1.16
***************
*** 313,316 ****
--- 313,330 ----
  	$url_video = $music_root_path . 'mediaplayer.swf';
  }
+ else if (($song_filetype == 'mp4') || (str_replace('rtmp://', 'rtmp://', $song_url)))
+ {
+ 	/*
+ 	if ( !is_object($mx_page) )
+ 	{
+ 		$mx_page = new mx_page();
+ 	}
+ 	$mx_page->add_footer_text( $music_root_path . 'music_player.js', true );
+ 	*/
+ 
+ 	$template->assign_block_vars('flv', array());
+ 	$url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id"));
+ 	$url_video = $music_root_path . 'mediaplayer.swf';
+ }
  else if ( ( $song_filetype == 'mod' ) )
  {

Index: music_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music_box/modules/music_cat.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** music_cat.php	10 Sep 2008 13:55:49 -0000	1.14
--- music_cat.php	5 Jan 2011 00:00:03 -0000	1.15
***************
*** 826,829 ****
--- 826,834 ----
  
  			$url_player = '';
+ 			$host = '';
+ 			$host_protocol = '';
+ 			
+ 			//$host = explode("//", $thissong['song_url']);
+ 			//$host_protocol = $host[0] . '//';
  
  			//
***************
*** 913,916 ****
--- 918,931 ----
  				));
  			}
+ 			else if( ( ($song_filetype == 'mp4') && !empty($thissong['song_url']) ) ||  str_replace('rtmp://', 'rtmp://', $song_url)  )
+ 			{
+ 				//$host = explode("//", $thissong['song_url']);
+ 				//$host_protocol = $host[0] . '//';
+ 				$template->assign_block_vars('songrow.flv', array());
+ 				$url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id"));				
+ 				$url_video = $music_root_path . 'mediaplayer.swf';
+ 				$mime_type= 'audio/x-mpeg'; //application/x-mplayer2
+ 				$row_type = 'flv';
+ 			}			
  			else if( ($song_filetype == 'pls') && !empty($thissong['song_url']) )
  			{