slitaz-tools rev 345

Add mp3,backup,dvd-video,vcd,svcd modes to burnbox
author Rohit Joshi <jozee@slitaz.org>
date Mon May 04 18:54:07 2009 +0000 (2009-05-04)
parents 7a5c4df5744f
children 499fc670fa22
files tinyutils/burnbox
line diff
     1.1 --- a/tinyutils/burnbox	Tue May 05 00:14:25 2009 +0200
     1.2 +++ b/tinyutils/burnbox	Mon May 04 18:54:07 2009 +0000
     1.3 @@ -4,74 +4,349 @@
     1.4  # can burn ISO images, blank rewritable CD or create audio CD with WAV.
     1.5  # 
     1.6  # (c) - SliTaz GNU/Linux 2009 - GNU GPL v3
     1.7 +
     1.8 +# Authors : Christophe Lincoln <pankso@slitaz.org>
     1.9 +#           Rohit Joshi <jozee@slitaz.org>
    1.10  #
    1.11 -VERSION=20090204
    1.12 +VERSION=20090504
    1.13 +TMPDIR="/tmp/burn-cd"
    1.14 +
    1.15 +
    1.16 +chk_install()
    1.17 +{	
    1.18 +	for pkg in $@
    1.19 +	do
    1.20 +		if [ ! -d /var/lib/tazpkg/installed/${pkg} ]; then
    1.21 +			UNINSTALLED="$UNINSTALLED $pkg"
    1.22 +		fi			
    1.23 +	done 
    1.24 +	if [ ! "$UNINSTALLED" = "" ] ; then
    1.25 +		xterm -bg gray93 -fg black -geometry 80x16 -title "INSTALL PACKAGE" \
    1.26 +				-e "echo -n \"this option depends on $UNINSTALLED Please install and try again\"; sleep 4;"
    1.27 +	fi	
    1.28 +}
    1.29  
    1.30  # Display audio cd size.
    1.31  audio_cd_stats()
    1.32  {
    1.33 -	AUDIO_CD_SIZE=`du -m /tmp/audio-cd | awk '{print $1}'`
    1.34 -	TRACK_NB=`ls -1 /tmp/audio-cd | wc -l`
    1.35 +	AUDIO_CD_SIZE=`du -m $TMPDIR | awk '{print $1}'`
    1.36 +	TRACK_NB=`ls -1 $TMPDIR | wc -l`
    1.37  	echo -n "Total tracks: $AUDIO_CD_SIZE Mb"
    1.38  }
    1.39  
    1.40 +# Display cd/dvd size.
    1.41 +disk_stats()
    1.42 +{
    1.43 +	DISK_SIZE=`du -m $TMPDIR | awk '{print $1}'`
    1.44 +	TRACK_NB=`ls -1 $TMPDIR | wc -l`
    1.45 +	echo -n "Total size: $DISK_SIZE Mb"
    1.46 +}
    1.47 +
    1.48  decode_ogg()
    1.49  {
    1.50 -	if ls /tmp/audio-cd | grep -q .ogg; then
    1.51 -		cd /tmp/audio-cd
    1.52 +	if ls $TMPDIR | grep -q .ogg; then
    1.53 +		cd $TMPDIR
    1.54  		xterm -bg gray93 -fg black -geometry 80x16 -title "Oggdec" \
    1.55  			-e 'for i in *.ogg; do oggdec "$i" && rm "$i"; done; sleep 2'
    1.56  	fi
    1.57  }
    1.58  
    1.59 +decode_mp3()
    1.60 +{
    1.61 +	
    1.62 +	if ls $TMPDIR | grep -q .mp3; then
    1.63 +		cd $TMPDIR
    1.64 +		UNINSTALLED=""
    1.65 +		chk_install "mpg123"
    1.66 +		if [ "$UNINSTALLED" = "" ] ; then
    1.67 +			xterm -bg gray93 -fg black -geometry 80x16 -title "mpg123" \
    1.68 +				-e 'for file in *.mp3; do 
    1.69 +						mpg123 --rate 44100 --stereo --buffer 3072 --resync -w  `basename "$file" .mp3`.wav "$file" && rm "$file"; 
    1.70 +				  done; sleep 2'
    1.71 +				  
    1.72 +		fi
    1.73 +	fi
    1.74 +}
    1.75 +
    1.76 +decode_video()
    1.77 +{
    1.78 +	# convert videos into a VCD/SVCD/DVD compatible mpg video format
    1.79 +	if ls $TMPDIR | grep -q ".avi\|.mov\|.wmv\|.flv"  ; then
    1.80 +		cd $TMPDIR
    1.81 +		UNINSTALLED=""
    1.82 +		chk_install "ffmpeg"
    1.83 +				
    1.84 +		if [ "$UNINSTALLED" = "" ] ; then
    1.85 +			xterm -bg gray93 -fg black -geometry 80x16 -title "ffmpeg" \
    1.86 +				-e ' echo -n "Select target type (pal-vcd ntsc-vcd pal-svcd ntsc-svcd pal-dvd ntsc-dvd) "; read TARGET_OPTIONS
    1.87 +					 for file in *.avi *.wmv *.mov *.flv; do
    1.88 +						 ext=`echo "${file##*.}"`
    1.89 +						 output_file=`basename "$file" .$ext`.mpg
    1.90 +					 	 ffmpeg -i "$file" -target "$TARGET_OPTIONS" "$output_file" && rm "$file";
    1.91 +					 done; sleep 2;
    1.92 +				   '
    1.93 +		fi
    1.94 +	fi
    1.95 +	
    1.96 +
    1.97 +}
    1.98 +
    1.99 +# convert spaces in filename with _ and remove special characters "()'&" {}\! and translate uppercase to lowercase
   1.100 +fix_filename()
   1.101 +{
   1.102 +	ls /tmp/burn-cd/* | while read file
   1.103 +	do
   1.104 +    	mv "$file" `echo $file | tr ' ' '_' | tr -d '[{}(),\!&]' | tr -d "\'" | tr '[A-Z]' '[a-z]' | sed 's/_-_/_/g' `
   1.105 +	done 
   1.106 +	
   1.107 +}
   1.108 +
   1.109  # We must think about " space " between directory/track and
   1.110  # filter directory copy to avoid copying other files than audio.
   1.111  # Only burning non-compressed wav format is supported directly.
   1.112 +
   1.113  copy_audio_file()
   1.114  {
   1.115  	if ls "$NEW_TRACK" | grep -q .ogg; then
   1.116 -		cp "${NEW_TRACK%.ogg}.ogg" /tmp/audio-cd
   1.117 -		decode_ogg
   1.118 +		cp "${NEW_TRACK%.ogg}.ogg" $TMPDIR
   1.119 +		fix_filename	
   1.120 +		decode_ogg 
   1.121 +	elif ls "$NEW_TRACK" | grep -q ".[m\|M][p\|P]3"; then
   1.122 +	  #	cp "${NEW_TRACK%.mp3}.mp3" $TMPDIR	
   1.123 +		cp "$NEW_TRACK" "$TMPDIR"	
   1.124 +		fix_filename
   1.125 +		decode_mp3
   1.126  	else
   1.127 -		cp "${NEW_TRACK%.wav}.wav" /tmp/audio-cd
   1.128 +		cp "${NEW_TRACK%.wav}.wav" $TMPDIR
   1.129  	fi
   1.130  }
   1.131 +
   1.132 +
   1.133  copy_audio_dir()
   1.134  {
   1.135 -	for i in .wav .ogg
   1.136 +	
   1.137 +	for i in .wav .ogg .mp3
   1.138  	do
   1.139 -		cp "$NEW_DIR"/*$i /tmp/audio-cd 2>/dev/null
   1.140 +		cp "$NEW_DIR"/*$i $TMPDIR 2>/dev/null
   1.141  	done
   1.142 -	decode_ogg
   1.143 +	fix_filename 
   1.144 +	decode_ogg  
   1.145 +	decode_mp3 
   1.146  }
   1.147  
   1.148 +# Only burning mpg video format is supported directly. MPEG-1 video for vcd and MPEG-2 for svcd and dvd
   1.149 +copy_video_file()
   1.150 +{
   1.151 +	if ls "$NEW_TRACK" | grep -q ".mpg\|.mpeg"; then
   1.152 +		cp "${NEW_TRACK%.mp*}.mpg" $TMPDIR
   1.153 +	elif ls "$NEW_TRACK" | grep -q ".avi\|.mov\|.wmv\|.flv"; then
   1.154 +	 	ext=`echo "${NEW_TRACK##*.}"`
   1.155 +		cp "${NEW_TRACK%.$ext}.$ext" $TMPDIR
   1.156 +		fix_filename
   1.157 +		if "$CHECKBOX_DECODE" ; then decode_video ; fi
   1.158 +	else
   1.159 +		echo "mpg format supported"
   1.160 +	fi
   1.161 +}
   1.162 +
   1.163 +copy_video_dir()
   1.164 +{
   1.165 +	for i in .mpg .avi .mov .wmv .mpeg .flv
   1.166 +	do
   1.167 +		cp "$NEW_DIR"/*$i $TMPDIR 2>/dev/null
   1.168 +	done
   1.169 +	fix_filename 	
   1.170 +	if "$CHECKBOX_DECODE" ; then decode_video ; fi
   1.171 +}
   1.172 +
   1.173 +copy_file()
   1.174 +{
   1.175 +	case "$BURN_MODE" in
   1.176 +			audio-cd) 
   1.177 +				copy_audio_file ;;
   1.178 +			vcd|svcd|video-dvd)
   1.179 +				copy_video_file ;;	
   1.180 +			*)	
   1.181 +				cp "$NEW_TRACK" $TMPDIR ; fix_filename ;;
   1.182 +	esac
   1.183 +	
   1.184 +}
   1.185 +
   1.186 +copy_dir()
   1.187 +{
   1.188 +	case "$BURN_MODE" in
   1.189 +			audio-cd) 
   1.190 +				copy_audio_dir ;;
   1.191 +			vcd|svcd|video-dvd)
   1.192 +				copy_video_dir ;;	
   1.193 +			*)	
   1.194 +				cp "$NEW_DIR" $TMPDIR 2>/dev/null 
   1.195 +				fix_filename ;;
   1.196 +	esac		
   1.197 +}
   1.198 +# =====ISO=====
   1.199  burn_iso()
   1.200  {
   1.201  	xterm -bg gray93 -fg black -geometry 80x16 -title "Wodim" \
   1.202  		-e "wodim -v speed=$SPEED dev=$DEVICE $OPTIONS $ISO_IMAGE; sleep 4"
   1.203  }
   1.204 -
   1.205 +# =====AUDIO=====
   1.206  # Use -pad to avoid file size error.
   1.207  burn_audio()
   1.208  {
   1.209 -	xterm -bg gray93 -fg black -geometry 80x16 -title "Wodim" \
   1.210 -		-e "wodim -v speed=$SPEED dev=$DEVICE $OPTIONS -pad -dao -audio /tmp/audio-cd/*.wav; sleep 4"
   1.211 +	UNINSTALLED=""
   1.212 +	chk_install "cdrkit"
   1.213 +	if [ "$UNINSTALLED" = "" ] ; then
   1.214 +		xterm -bg gray93 -fg black -geometry 80x16 -title "Wodim:AUDIO" \
   1.215 +			-e " echo \"BURN TYPE SELECTED = $BURN_MODE \"; sleep 1;				
   1.216 +			 wodim -v speed=$SPEED dev=$DEVICE $OPTIONS -pad -dao -audio $TMPDIR/*.wav; sleep 4
   1.217 +		"
   1.218 +	fi
   1.219 +}
   1.220 +# =====DATA=====
   1.221 +burn_cddata()
   1.222 +{
   1.223 +	UNINSTALLED=""
   1.224 +	chk_install "cdrkit"
   1.225 +	if [ "$UNINSTALLED" = "" ] ; then
   1.226 +		xterm -bg gray93 -fg black -geometry 80x16 -title "Wodim:CD DATA" \
   1.227 +			-e " echo \"BURN TYPE SELECTED = $BURN_MODE \"; sleep 1;
   1.228 +				wodim -v speed=$SPEED dev=$DEVICE $OPTIONS -pad -dao -data $TMPDIR/*; sleep 4
   1.229 +			"
   1.230 +	fi					
   1.231  }
   1.232  
   1.233 +burn_dvddata()
   1.234 +{
   1.235 +	UNINSTALLED=""
   1.236 +	chk_install "dvd+rw-tools"
   1.237 +	if [ "$UNINSTALLED" = "" ] ; then
   1.238 +		xterm -bg gray93 -fg black -geometry 80x16 -title "growisofs:DVD DATA" \
   1.239 +			-e " echo \"BURN TYPE SELECTED = $BURN_MODE \"; sleep 1;
   1.240 +				# no iso-file available
   1.241 +				growisofs -dvd-compat -speed=$SPEED -pad -J -r -f -Z  $DEVICE  $TMPDIR/*; sleep 4	
   1.242 +				"
   1.243 +	fi	
   1.244 +}
   1.245 +
   1.246 +# ====VIDEO=====
   1.247 +burn_dvdvideo()
   1.248 +{
   1.249 +	UNINSTALLED=""
   1.250 +	chk_install "dvd+rw-tools"
   1.251 +	
   1.252 +	# current assumption: compatible dvd-video format
   1.253 +	if [ "$UNINSTALLED" = "" ] ; then
   1.254 +			xterm -bg gray93 -fg black -geometry 80x16 -title "growisofs:DVD VIDEO" \
   1.255 +			-e " echo \"BURN TYPE SELECTED = $BURN_MODE\"; sleep 1;    
   1.256 +			   	 growisofs -dvd-video -udf -pad -J -r -f -Z $DEVICE -speed=$SPEED  $TMPDIR/*; sleep 2
   1.257 +				"	
   1.258 +	fi		
   1.259 +}
   1.260 +burn_vcd()
   1.261 +{
   1.262 +	UNINSTALLED=""
   1.263 +	chk_install "vcdimager"
   1.264 +	if [ "$UNINSTALLED" = "" ] ; then
   1.265 +		mkdir -p $TMPDIR/vcd
   1.266 +		xterm -bg gray93 -fg black -geometry 80x16 -title "vcdimager:VCD" \
   1.267 +			-e " echo \"BURN TYPE SELECTED = $BURN_MODE $UNINSTALLED \"; sleep 1;
   1.268 +				 vcdimager -t vcd2 -l VCD -c $TMPDIR/vcd/vcd.cue -b $TMPDIR/vcd/vcd.bin $TMPDIR/*.mpg; sleep 2; 
   1.269 +				# cdrdao write --device $DEVICE $TMPDIR/vcd/vcd.cue; sleep 2
   1.270 +				  wodim -v speed=$SPEED dev=$DEVICE $OPTIONS -pad -dao cuefile=$TMPDIR/vcd/vcd.cue ; sleep 2				
   1.271 +				"	
   1.272 +	fi	
   1.273 +		
   1.274 +}
   1.275 +
   1.276 +burn_svcd()
   1.277 +{
   1.278 +	UNINSTALLED=""
   1.279 +	chk_install "vcdimager"
   1.280 +	if [ "$UNINSTALLED" = "" ] ; then
   1.281 +		mkdir -p $TMPDIR/svcd
   1.282 +		xterm -bg gray93 -fg black -geometry 80x16 -title "vcdimager:SVCD" \
   1.283 +			-e " echo \"BURN TYPE SELECTED = $BURN_MODE\"
   1.284 +				  vcdimager -t svcd -l SVCD -c $TMPDIR/svcd/svcd.cue -b $TMPDIR/svcd/svcd.bin $TMPDIR/*.mpg; sleep 2; 
   1.285 +				 # cdrdao write --device $DEVICE $TMPDIR/svcd/svcd.cue; sleep 2;
   1.286 +				 wodim -v speed=$SPEED dev=$DEVICE $OPTIONS -pad -dao cuefile=$TMPDIR/svcd/svcd.cue ; sleep 2
   1.287 +				"	
   1.288 +	fi	
   1.289 +}
   1.290 +
   1.291 +# =====CLONE=====
   1.292 +rip_disc()
   1.293 +{
   1.294 +	SUGGESTED="cdrkit-isoinfo"
   1.295 +	if ! "$CHECKBOX_FOLDER" ; then SAVE_DISC="/tmp/burn-cd" ; fi	
   1.296 +	if [ -d /var/lib/tazpkg/installed/${SUGGESTED} ]; then
   1.297 +		xterm -bg gray93 -fg black -geometry 80x16 -title "dd" \
   1.298 +			-e ' echo "RIPPING DISK AT $SAVE_DISC..."
   1.299 +				 COUNT=`isoinfo -d -i $DEVICE | grep "^Volume size is:" | cut -d " " -f 4`
   1.300 +				 BLOCK=`isoinfo -d -i $DEVICE | grep "^Logical block size is:" | cut -d " " -f 5`
   1.301 +				 dd if=$DEVICE of=$SAVE_DISC/image.iso bs=$BLOCK count=$COUNT; sleep 4
   1.302 +				 sleep 2;'
   1.303 +	else 
   1.304 +		xterm -bg gray93 -fg black -geometry 80x16 -title "dd" \
   1.305 +			-e '   echo " Though you dont have the cdrkit-extras package installed, \
   1.306 +				         you can still rip but it may be slower"
   1.307 +					echo -n "would you like to continue (y/N)? : "; read ans
   1.308 +					if [ "$ans" = "y" ]; then 
   1.309 +						echo "RIPPING DISK AT $SAVE_DISC...."
   1.310 +						dd if=$DEVICE of=$SAVE_DISC/image.iso; 
   1.311 +						sleep 2;
   1.312 +					fi
   1.313 +					'
   1.314 +	fi	
   1.315 +	if ! "$CHECKBOX_FOLDER" ; then 
   1.316 +				ISO_IMAGE="/tmp/burn-cd/image.iso"
   1.317 +				xterm -bg gray93 -fg black -geometry 80x16 -title "dd" \
   1.318 +			-e ' echo -e " ---Please insert EMPTY DISK at $DEVICE ---\n ---press ENTER to continue..." && read close;'
   1.319 +				burn_iso
   1.320 +	fi
   1.321 +}
   1.322 +
   1.323 +blank_dvd()
   1.324 +{
   1.325 +	xterm -bg gray93 -fg black -geometry 80x16 -title "growisofs:DVD ERASE" \
   1.326 +		-e "growisofs -Z $DEVICE=/dev/zero"
   1.327 +}
   1.328 +
   1.329 +burn_disc()
   1.330 +{
   1.331 +  	case "$BURN_MODE" in
   1.332 +			audio*)
   1.333 +				burn_audio ;;
   1.334 +			data-cd*)
   1.335 +				burn_cddata ;;
   1.336 +			data-dvd*)
   1.337 +				burn_dvddata;;
   1.338 +			video*)
   1.339 +				burn_dvdvideo;;
   1.340 +			vcd*)
   1.341 +				burn_vcd;;
   1.342 +			svcd*)
   1.343 +				burn_svcd;;			
   1.344 +	esac
   1.345 +		
   1.346 +}
   1.347  # Main GTK interface
   1.348  MAIN_DIALOG='
   1.349  <window title="SliTaz - Burnbox" icon-name="drive-optical">
   1.350  <vbox>
   1.351  
   1.352 -	<notebook labels="General|ISO image|Audio CD">
   1.353 +	<notebook labels="General|ISO image or rip| Burn CD/DVD (Audio,Video,Data)">
   1.354  	
   1.355  	<vbox>
   1.356  		<frame Information>
   1.357  			<text>
   1.358  				<label>
   1.359 -"Burn CD or DVD using Wodim from cdrkit. Before burning,
   1.360 -please verify device writer settings or add options if needed.
   1.361 -Audio CD uses uncompressed WAV (OGG are decoded)."
   1.362 +"Burn CD, Video CD and DVD using Wodim, Vcdimager and Growisofs.
   1.363 + 
   1.364 +Audio CD use uncompressed WAV (OGG, MP3 are decoded).
   1.365 +VCD/SVCD use MPG files (AVI, FLV, MOV, WMV are decoded).
   1.366 +
   1.367 +Before burning, please verify device writer settings or add options if needed."
   1.368  				</label>
   1.369  			</text>
   1.370  		</frame>
   1.371 @@ -131,7 +406,7 @@
   1.372  	</vbox>
   1.373  	
   1.374  	<vbox>
   1.375 -		<frame Select and burn>
   1.376 +		<frame Select ISO and burn>
   1.377  		
   1.378  			<text>
   1.379  				<label>
   1.380 @@ -163,6 +438,49 @@
   1.381  					<action>$0 burn_iso</action>
   1.382  				</button>
   1.383  			</hbox>"
   1.384 +# Backup CD
   1.385 +MAIN_DIALOG=${MAIN_DIALOG}'
   1.386 +	</frame>
   1.387 +	<frame Select CD/DVD-RW and rip>
   1.388 +			<text>
   1.389 +				<label> 
   1.390 +"You can also clone or rip a CD/DVD. Just specify the path and click burn disk or use dd from the command line. Input is taken from the DEVICE settings
   1.391 +" 
   1.392 +				</label>
   1.393 +			</text>
   1.394 +			<checkbox>
   1.395 +				<label>Save output in folder (Unselect to backup on disc) </label>
   1.396 +				<variable>CHECKBOX_FOLDER</variable>
   1.397 +				<default>true</default>
   1.398 +				<action>if true enable:SAVE_DISC</action>
   1.399 +				<action>if true enable:OPENBUTTON</action>
   1.400 +				<action>if false disable:SAVE_DISC</action>
   1.401 +				<action>if false disable:OPENBUTTON</action>				
   1.402 +			</checkbox>
   1.403 +			<hbox>
   1.404 +				<text use-markup="true">
   1.405 +					<label>"<b>Output CD/DVD rip at:</b>"</label>
   1.406 +				</text>
   1.407 +				<entry accept="directory">
   1.408 +				<label>Select a folder to save cloned disk to</label>
   1.409 +					<variable>SAVE_DISC</variable>
   1.410 +				</entry>
   1.411 +				<button>
   1.412 +					<input file stock="gtk-open"></input>
   1.413 +					<variable>OPENBUTTON</variable>
   1.414 +					<action type="fileselect">SAVE_DISC</action>
   1.415 +				</button>
   1.416 +			</hbox>
   1.417 +'
   1.418 +# Burn backup button.
   1.419 +MAIN_DIALOG=${MAIN_DIALOG}"
   1.420 +			<hbox>
   1.421 +				<button>
   1.422 +					<label>Burn disk</label>
   1.423 +					<input file icon=\"forward\"></input>
   1.424 +					<action>$0 rip_disc</action>
   1.425 +				</button>
   1.426 +			</hbox>"			
   1.427  MAIN_DIALOG=${MAIN_DIALOG}'
   1.428  		</frame>
   1.429  		
   1.430 @@ -171,20 +489,43 @@
   1.431  		<tree icon_name="audio-x-generic">
   1.432  			<width>500</width><height>200</height>
   1.433  			<variable>TRACKS_LIST</variable>
   1.434 -			<label>Track name</label>
   1.435 -			<input>ls -1 /tmp/audio-cd</input>
   1.436 -			<action>rm "/tmp/audio-cd/$TRACKS_LIST"</action>
   1.437 +			<label>Track name (Double-click to remove a track)</label>
   1.438 +			<input>ls -1 /tmp/burn-cd</input>
   1.439 +			<action>rm "/tmp/burn-cd/$TRACKS_LIST"</action>
   1.440  			<action>refresh:TRACKS_LIST</action>
   1.441  			<action>refresh:TRACKS_SIZE</action>
   1.442  		</tree>'
   1.443 +# Select burn audio-cd, data-cd, dvd-video or vcd/svcd		
   1.444 +MAIN_DIALOG=${MAIN_DIALOG}'
   1.445 +   <frame>
   1.446 +		  <hbox>
   1.447 +		   <text>
   1.448 +				<label> Burn type: </label>
   1.449 +			</text>
   1.450 +			<combobox>'
   1.451 +			tmp2="${MAIN_DIALOG}"
   1.452 +			for i in audio-cd data-cd data-dvd video-dvd vcd svcd; do
   1.453 +					[ "$i" = "$BURN_MODE" ] || tmp2="$tmp2<item>$i</item>"
   1.454 +			done
   1.455 +			tmp3='
   1.456 +			<variable>BURN_MODE</variable>						
   1.457 +			</combobox>
   1.458 +			<checkbox>
   1.459 +				<label> Enable decoding video</label>
   1.460 +				<variable>CHECKBOX_DECODE</variable>
   1.461 +				<default>true</default>											
   1.462 +			</checkbox>
   1.463 +			</hbox>
   1.464 +			'
   1.465 +MAIN_DIALOG="$tmp2$tmp3"
   1.466  # Select, add and burn audio buttons.
   1.467  MAIN_DIALOG=${MAIN_DIALOG}"
   1.468  		<hbox>
   1.469  			<text>
   1.470 -				<label>Title:   </label>
   1.471 +				<label> File:     </label>
   1.472  			</text>
   1.473  			<entry accept=\"filename\">
   1.474 -				<label>Select an Audio track</label>
   1.475 +				<label>Select an Audio/Video/data track</label>
   1.476  				<variable>NEW_TRACK</variable>
   1.477  			</entry>
   1.478  			<button>
   1.479 @@ -194,17 +535,17 @@
   1.480  			<button>
   1.481  				<label>Add</label>
   1.482  				<input file stock=\"gtk-add\"></input>
   1.483 -				<action>$0 copy_audio_file</action>
   1.484 +				<action>$0 copy_file</action>
   1.485  				<action>refresh:TRACKS_LIST</action>
   1.486 -				<action>refresh:TRACKS_SIZE</action>
   1.487 +				<action>refresh:TRACKS_SIZE</action>				
   1.488  			</button>
   1.489  		</hbox>
   1.490  		<hbox>
   1.491  			<text>
   1.492 -				<label>Album:</label>
   1.493 +				<label> Folder:</label>
   1.494  			</text>
   1.495  			<entry accept=\"directory\">
   1.496 -				<label>Select an Audio track</label>
   1.497 +				<label>Select an Audio/Video/Data track</label>
   1.498  				<variable>NEW_DIR</variable>
   1.499  			</entry>
   1.500  			<button>
   1.501 @@ -214,11 +555,14 @@
   1.502  			<button>
   1.503  				<label>Add</label>
   1.504  				<input file stock=\"gtk-add\"></input>
   1.505 -				<action>$0 copy_audio_dir</action>
   1.506 +				<action>$0 copy_dir</action>
   1.507  				<action>refresh:TRACKS_LIST</action>
   1.508 +				
   1.509  				<action>refresh:TRACKS_SIZE</action>
   1.510  			</button>
   1.511 -		</hbox>
   1.512 +		</hbox>"
   1.513 +
   1.514 +MAIN_DIALOG=${MAIN_DIALOG}"
   1.515  		<hbox>
   1.516  			<text>
   1.517  				<variable>TRACKS_SIZE</variable>
   1.518 @@ -227,7 +571,7 @@
   1.519  			<button>
   1.520  				<label>Clean</label>
   1.521  				<input file stock=\"gtk-clear\"></input>
   1.522 -				<action>rm -rf /tmp/audio-cd/*</action>
   1.523 +				<action>rm -rf $TMPDIR/*</action>
   1.524  				<action>refresh:TRACKS_LIST</action>
   1.525  				<action>refresh:TRACKS_SIZE</action>
   1.526  				<action>clear:NEW_TRACK</action>
   1.527 @@ -236,10 +580,14 @@
   1.528  			<button>
   1.529  				<label>Burn disk</label>
   1.530  				<input file icon=\"forward\"></input>
   1.531 -				<action>$0 burn_audio</action>
   1.532 +				<action>$0 burn_disc</action>
   1.533  			</button>
   1.534  		</hbox>
   1.535 -	</vbox>"
   1.536 +		</frame>
   1.537 +	</vbox> "
   1.538 +#
   1.539 +#				
   1.540 +# tmp3=	
   1.541  export MAIN_DIALOG=${MAIN_DIALOG}'
   1.542  	
   1.543  	</notebook>
   1.544 @@ -260,9 +608,9 @@
   1.545  if [ -n "$1" ]; then
   1.546  	$1
   1.547  else
   1.548 -	mkdir -p /tmp/audio-cd
   1.549 +	mkdir -p $TMPDIR
   1.550  	gtkdialog --center --program=MAIN_DIALOG >/dev/null
   1.551 -	rm -rf /tmp/audio-cd
   1.552 +	rm -rf $TMPDIR
   1.553  fi
   1.554  
   1.555  exit 0