[Amsn-commits] amsn-extras/plugins/music music.tcl,1.37,1.38

[Karel D. <sc...@us...>]

Update of /cvsroot/amsn/amsn-extras/plugins/music
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10029

Modified Files:
	music.tcl 
Log Message:
being a bit smarter

Index: music.tcl
===================================================================
RCS file: /cvsroot/amsn/amsn-extras/plugins/music/music.tcl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** music.tcl	21 Feb 2006 16:26:18 -0000	1.37
--- music.tcl	21 Feb 2006 18:06:35 -0000	1.38
***************
*** 15,20 ****
  		variable musicpluginpath
  		variable playersarray
! 		variable oldinfo		
  		set musicpluginpath $dir
  		set oldinfo ""
  
--- 15,23 ----
  		variable musicpluginpath
  		variable playersarray
! 		variable oldinfo
! 		variable dppath
! 				
  		set musicpluginpath $dir
+ 		set dppath [::config::getKey displaypic]
  		set oldinfo ""
  
***************
*** 38,48 ****
  		#Add items to configure window
  		::music::ConfigList
- 
- 		image create photo olddp 
- 		#make sure we put the no_pic for if there is no my_pic
- 		olddp copy no_pic
- 		olddp copy my_pic
- 		
- 		status_log "MUSIC ||| old pic saved as olddp" black
  		
  		#Start changing the nickname on loading
--- 41,44 ----
***************
*** 51,55 ****
  		after 5000 ::music::add_command 0 0
  	}
! 	
  	#####################################################
  	# ::music::LoadLangFiles dir                        #
--- 47,53 ----
  		after 5000 ::music::add_command 0 0
  	}
! 
! 
! 
  	#####################################################
  	# ::music::LoadLangFiles dir                        #
***************
*** 169,173 ****
  			}
  		}
- status_log "MUSIC ||| CONFIG SET"
  
  	}
--- 167,170 ----
***************
*** 182,186 ****
  		variable playersarray
  		
- 		status_log "os ver"
  		
  		#Define values for supported player on darwin and linux
--- 179,182 ----
***************
*** 193,197 ****
  				"Amarok" [list GetSongAmarok TreatSongAmarok] \
  				"Banshee" [list GetSongBanshee TreatSongBanshee] \
- 				"Totem" [list GetSongTotem TreatSongTotem] \
  			] \
  			"windows nt" [list \
--- 189,192 ----
***************
*** 233,236 ****
--- 228,232 ----
  		variable activated
  		variable oldinfo
+ 		variable dppath
  		
  		
***************
*** 238,243 ****
  		set info [::music::GetSong]
  
- 		status_log "IN NEWNAME, info : $info"
- 
  		#if none of the info changed since the last check, we don't change anything
  		if {$info != $oldinfo} {
--- 234,237 ----
***************
*** 317,323 ****
  					#if the album cover isn't available, set the dp the user set\
  						before changes by musicplugin
! 		 			if {![catch {::picture::Save olddp $smallcoverfilename cxjpg}]} {
! 						set_displaypic $smallcoverfilename
! 					}
  				}
  	 		}
--- 311,317 ----
  					#if the album cover isn't available, set the dp the user set\
  						before changes by musicplugin
! 					::music::log "No album art found, use $dppath"
! 					set_displaypic 	$dppath
! 
  				}
  	 		}
***************
*** 859,862 ****
--- 853,857 ----
  		variable activated
  		variable musicpluginpath
+ 		variable dppath
  		
  		if {[array size ::music::playersarray]==0} {
***************
*** 873,880 ****
  	   	}
  
! 	   	set smallcoverfilename [file join $musicpluginpath albumart.jpg]
! 		if {![catch {::picture::Save olddp $smallcoverfilename cxjpg}]} {
! 			set_displaypic $smallcoverfilename
! 		}
  	}
  
--- 868,873 ----
  	   	}
  
! 		#reset displaypicture
! 		set_displaypic $dppath
  	}