diff --git a/html/lmbrowse.php b/html/lmbrowse.php index 3679f1a..7d41fe5 100644 --- a/html/lmbrowse.php +++ b/html/lmbrowse.php @@ -1,8 +1,8 @@ // $RCSfile: lmbrowse.php,v $ -// $Revision: 1.5 $ +// $Revision: 1.6 $ // $Name: $ -// $Date: 2013/01/17 23:05:07 $ +// $Date: 2013/03/21 16:21:45 $ // $Author: agibert $ /* @@ -852,7 +852,7 @@ function lmb_welcome_tab( ) $data = ob_get_contents(); ob_end_clean(); - lmb_make_tab( "welcome", "welcome", "l", "/images/lm-logo3-n-220.png", $data); + lmb_make_tab( "welcome", "welcome", "l", "/images/lm-logo5-n-220.png", $data); } @@ -914,7 +914,7 @@ function lmb_news_tab( ) $data = ob_get_contents(); ob_end_clean(); - lmb_make_tab( "news", "news", "r", "/images/lm-logo3-n-220.png", $data); + lmb_make_tab( "news", "news", "r", "/images/lm-logo5-n-220.png", $data); } @@ -975,7 +975,7 @@ function lmb_about_tab( ) $data = ob_get_contents(); ob_end_clean(); - lmb_make_tab( "about", "about", "l", "/images/lm-logo4-n-220.png", $data); + lmb_make_tab( "about", "about", "l", "/images/lm-logo6-n-220.png", $data); } @@ -1021,7 +1021,7 @@ function lmb_history_tab() $data = ob_get_contents(); ob_end_clean(); - lmb_make_tab( "history", "history", "r", "/images/lm-logo4-n-220.png", $data); + lmb_make_tab( "history", "history", "r", "/images/lm-logo6-n-220.png", $data); } @@ -1348,6 +1348,11 @@ function lmb_track_info_get( $play_type, $play_id, $play_priority, $track_id) $track_info["sample_rate"] = $tab[8]; $track_info["sample_nb"] = $tab[9]; + if( "{$track_info["title"]}" == "{$track_info["mix"]}") + { + $track_info["mix"]=""; + } + $total = intval( $track_info["sample_nb"] / $track_info["sample_rate"]); $min = intval( $total / 60); $sec = $total - $min * 60; @@ -1674,13 +1679,13 @@ function lmb_coverlist( $play_type, $play_id, $play_priority) } else { - if( $i == ( count($sheet_tab) - 1)) + if( $i == 1) { $sheet_name="Back"; } else { - $sheet_name="$i"; + $sheet_name=$i-1; } } @@ -2347,7 +2352,16 @@ function lmb_jplayer_insert( $play_type, $play_id, $play_priority, $track_id, $t $play_path = "discography/{$play_type}/{$play_priority}-{$play_id}"; $track_path = "{$play_path}/tracks"; - $track_file_base = "{$track_id}-{$track_name}-{$track_mix}"; + + if( "{$track_mix}" == "") + { + $track_file_base = "{$track_id}-{$track_name}"; + } + else + { + $track_file_base = "{$track_id}-{$track_name}-{$track_mix}"; + } + $track_file_ogg = "{$track_path}/ogg-256/{$track_file_base}.ogg"; $track_file_mp3 = "{$track_path}/mp3-192/{$track_file_base}.mp3"; @@ -2626,7 +2640,7 @@ function lmb_track_download( $play_type, $play_id, $play_priority, $track_id, $t
"; - $mix_list = glob( "discography/*/*/tracks/flac/*-{$track_name}-*.flac"); + $mix_list = glob( "discography/*/*/tracks/flac/*-{$track_name}*.flac"); for( $i = 0, $k = 0; $i < count( $mix_list); $i++) { @@ -2655,7 +2669,7 @@ function lmb_track_download( $play_type, $play_id, $play_priority, $track_id, $t $css_row = ( $k + 1 + count( $mix_tab)) % 2 + 3; echo "