*** AlbumItem.php.orig	Tue Jan 21 11:27:16 2003
--- AlbumItem.php	Tue Feb 11 07:56:44 2003
***************
*** 259,271 ****
  					}
  					fs_unlink("$dir/$name.tmp.$tag");
  				} else {
! 					$ret = resize_image("$dir/$name.$tag", 
  							    "$dir/$name.highlight.$tag",
  							    $gallery->app->highlight_size);
  				}
  			}
  
  			if ($ret) {
  				list($w, $h) = getDimensions("$dir/$name.highlight.$tag");
  
  				$high = new Image;
--- 259,277 ----
  					}
  					fs_unlink("$dir/$name.tmp.$tag");
  				} else {
! 					if(isMovie($tag))
! 						$ret = resize_image("$dir/$name.thumb.jpg", 
! 							    "$dir/$name.highlight.jpg",
! 							    $gallery->app->highlight_size);
! 					else
! 						$ret = resize_image("$dir/$name.$tag", 
  							    "$dir/$name.highlight.$tag",
  							    $gallery->app->highlight_size);
  				}
  			}
  
  			if ($ret) {
+ 				if(isMovie($tag)) $tag = "jpg";
  				list($w, $h) = getDimensions("$dir/$name.highlight.$tag");
  
  				$high = new Image;
***************
*** 354,361 ****
  		$tag = $this->image->type;
  
  		if (isMovie($tag)) {
! 			/* Use a preset thumbnail */
! 			fs_copy($gallery->app->movieThumbnail, "$dir/$name.thumb.jpg");
  			$this->thumbnail = new Image;
  			$this->thumbnail->setFile($dir, "$name.thumb", "jpg");
  
--- 360,391 ----
  		$tag = $this->image->type;
  
  		if (isMovie($tag)) {
! 			$sessionId = session_id();
! 			// how much (time) of the movie do we grab
! 			$ffmpegTime = "0:0:0.001";
! 			// which frame will we use (first one)
! 			$ffmpegUseFrame = "0001";
! 			// format for tmp files
! 			$tmpThumbFmt = $gallery->app->tmpDir."/$sessionId.movieThumb";
! 			$tmpThumbTyp = "jpg";
! 			$tmpThumb = "$tmpThumbFmt.$ffmpegUseFrame.$tmpThumbTyp";
! 			/* do we have ffmpeg installed */
! 			if($gallery->app->use_ffmpeg && file_exists($gallery->app->use_ffmpeg)){
! 				$cmd = $gallery->app->use_ffmpeg." -an -y -t $ffmpegTime -i $dir/$name.$tag $tmpThumbFmt.%4d.$tmpThumbTyp 2>$tmpThumbFmt.log";
! 				list($results, $status) = exec_internal($cmd);
! 				if($status > 0){
! 					gallery_error(array_pop( file("$tmpThumbFmt.log")));
! 				}
! 			}
! 			/* were we able to generate the thumb? */
! 			if(file_exists($tmpThumb)){
! 				fs_copy($tmpThumb, "$dir/$name.thumb.jpg");
! 				$ret = resize_image("$dir/$name.thumb.jpg", "$dir/$name.thumb.jpg", $thumb_size);
! 				exec_wrapper("rm -f $tmpThumbFmt.[0-9]*.$tmpThumbTyp");
! 			}else{
! 				/* Use a preset thumbnail */
! 				fs_copy($gallery->app->movieThumbnail, "$dir/$name.thumb.jpg");
! 			}
  			$this->thumbnail = new Image;
  			$this->thumbnail->setFile($dir, "$name.thumb", "jpg");
  
***************
*** 365,371 ****
  			/* Make thumbnail (first crop it spec) */
  			if ($pathToThumb) {
  				$ret = copy ($pathToThumb,"$dir/$name.thumb.$tag");
! 			} else if ($this->image->thumb_width > 0)
  			{
  				$ret = cut_image("$dir/$name.$tag", 
  								 "$dir/$name.thumb.$tag", 
--- 395,401 ----
  			/* Make thumbnail (first crop it spec) */
  			if ($pathToThumb) {
  				$ret = copy ($pathToThumb,"$dir/$name.thumb.$tag");
! 			} else if ($this->image->thumb_width > 0) 
  			{
  				$ret = cut_image("$dir/$name.$tag", 
  								 "$dir/$name.thumb.$tag",