[mxbb-commits] mx_music music.php,1.25,1.26

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

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

Modified Files:
	music.php 
Log Message:
fix

Index: music.php
===================================================================
RCS file: /cvsroot/mxbb/mx_music/music.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** music.php	10 Sep 2008 12:26:16 -0000	1.25
--- music.php	10 Sep 2008 13:55:49 -0000	1.26
***************
*** 743,747 ****
  				'QT' => '',
  				'FLV' => '',
! 				'MOD' => '',				
  				'IMG' => '',
  				'MEDIA' => '')		
--- 743,748 ----
  				'QT' => '',
  				'FLV' => '',
! 				'MOD' => '',
! 				'XMOD' => '',				
  				'IMG' => '',
  				'MEDIA' => '')		
***************
*** 757,761 ****
  				'QT' => 'qt',
  				'FLV' => 'flv',
! 				'MOD' => 'mod',				
  				'IMG' => 'img',
  				'MEDIA' => 'media')		
--- 758,763 ----
  				'QT' => 'qt',
  				'FLV' => 'flv',
! 				'MOD' => 'mod',
! 				'XMOD' => 'xmod',				
  				'IMG' => 'img',
  				'MEDIA' => 'media')		
***************
*** 1175,1185 ****
  						$row_type = 'flv';
  					}
! 					else if ( ( $song_filetype == 'mod' ) || ( $song_filetype == 's3m' ) || ( $song_filetype == 'ult' ) || ( $song_filetype == '.xm' )  )
  					{
  						$template->assign_block_vars('songrow.mod', array());
! 						$url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id"));
  						$url_video = $music_root_path . 'modplayer.swf';
  						$row_type = 'mod';
! 					}					
  					else if ( ( $song_filetype == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) )
  					{
--- 1177,1206 ----
  						$row_type = 'flv';
  					}
! 					else if ( ( $song_filetype == 'mod' ) )
  					{
  						$template->assign_block_vars('songrow.mod', array());
! 						$url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id"));				
  						$url_video = $music_root_path . 'modplayer.swf';
+ 						$mime_type= 'audio/x-' . $song_filetype; //application/x-mplayer2
  						$row_type = 'mod';
! 					}
! 					else if ( ( $song_filetype == 's3m' ) || ( $song_filetype == 'ult' ) || ( $song_filetype == '.xm' )  )
! 					{
! 						//$template->assign_block_vars('songrow.mod', array());
! 						$template->assign_block_vars('songrow.xmod', array());
! 						$url_download = mx_append_sid(this_mo_mxurl("music_mode=music_download&song_id=$song_id"));				
! 						$url_video = $music_root_path . 'modplayer.swf';
! 						$mime_type= 'audio/x-' . $song_filetype; //application/x-mplayer2
! 						//$row_type = 'mod';
! 						$row_type = 'xmod';
! 					}
! 					else if ( ( $song_filetype == '.mp3' ) )
! 					{
! 						$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 == '.jpg' ) || ( $song_filetype == '.gif' ) || ( $song_filetype == '.png' ) )
  					{
***************
*** 1452,1456 ****
  						case '.xm':
  							$url_song = PORTAL_URL. str_replace('./', '/', MUSIC_UPLOAD_PATH) . $thissong['song_filename']; 
! 							break;				
  
  						default:
--- 1473,1481 ----
  						case '.xm':
  							$url_song = PORTAL_URL. str_replace('./', '/', MUSIC_UPLOAD_PATH) . $thissong['song_filename']; 
! 							break;
! 
! 						case 'mp3':
! 							$url_song = PORTAL_URL. str_replace('./', '/', MUSIC_UPLOAD_PATH) . $thissong['song_filename']; 
! 							break;					
  
  						default: