*** /usr/bin/gnump3d2	Mon Dec 10 13:24:20 2007
--- /usr/bin/gnump3d2.001-3.0	Mon Dec 10 13:55:24 2007
***************
*** 131,136 ****
--- 131,137 ----
  our $new_format;       # Text to display next to `New` directories.
  our $new_days;         # Days old a file must be to count as new.
  our $song_format;      # Display format string for song titles.
+ our $infotxt_file;     # Name of file for additional html.
  our $hide_song_tags;   # Should we just disable song tags?
  our $disable_tag_cache; # Should we just disable tag caching?
  our $NOW_PLAYING_PATH; # Cache file for the 'currently' playing tracks.
***************
*** 1846,1856 ****
--- 1847,1869 ----
      my $cmd = &getConfig( $configKey, "" );
      if ( not( length( $cmd ) ) )
      {
+ 	$configKey = "downsample_" . $quality;
+ 	$cmd = &getConfig( $configKey, "" );
+ 	if ( not( length( $cmd ) ) )
+ 	{
  		$DEBUG && print "Downsample disabled we didnt find a command for filetype '$configKey'\n";
  		serveFile( $data, $file );
  		exit;
+ 	}
      }
  
+     if ( $cmd =~ m/DISABLE/ )
+     {
+ 	$DEBUG && print "Downsample disabled for filetype '$configKey'\n";
+ 	serveFile( $data, $file );
+ 	exit;
+     }
+ $DEBUG && print "Downsample command is $cmd\n";
  
      #
      # Expand the filename in the command line, taking care of
***************
*** 2185,2190 ****
--- 2198,2213 ----
  	    $total .= &getBanner( $path );
  	    $total .= $post;
  	}
+ 	elsif ( $line =~ /(.*)\$INFOTXT(.*)/ )
+ 	{
+ 	    my $fname = "$dir" . $infotxt_file;
+ 	    my @lines = &readFile( "$fname" );
+ 
+ 	    foreach my $row (@lines)
+ 	    {
+ 		$total .= $row;
+ 	    }
+ 	}
  	elsif ( $line =~ /(.*)\$DIRECTORIES(.*)/ )
  	{
  	    #
***************
*** 3321,3326 ****
--- 3344,3350 ----
    {
       $always_stream = 0;
    }
+   $infotxt_file   = getConfig( "infotxt_file", "info.html" );
  
  
    #
*** /usr/share/gnump3d/Tabular/index.html.000	Tue May 31 14:33:19 2005
--- /usr/share/gnump3d/Tabular/index.html	Wed Apr 25 18:00:59 2007
***************
*** 99,104 ****
--- 99,106 ----
  $BANNER
  </p>
  
+ $INFOTXT
+ 
  <PLAYLISTS>
  <table border="0" cellpadding="0" cellspacing="5" width="100%" bgcolor="#000000">
  <tr><td>
*** /etc/gnump3d/gnump3d.conf.000	Sun Apr 22 10:19:10 2007
--- /etc/gnump3d/gnump3d.conf	Sun Apr 29 17:22:25 2007
***************
*** 530,536 ****
  #  This is useful if you want to have alternating background colors for
  #  each entry in a table, for example.
  #
! file_format = <tr><td width="10%">&nbsp;</td><td><a href="$LINK">$SONG_FORMAT</a></td><td align="right">[<a href="/info$PLAINLINK">Info</a>] [<a href="$PLAINLINK">Download</a>]</td></tr>
  
  
  
--- 530,536 ----
  #  This is useful if you want to have alternating background colors for
  #  each entry in a table, for example.
  #
! file_format = <tr><td width="10%">&nbsp;</td><td><a href="$LINK">$SONG_FORMAT</a></td><td align="right">[<a href="/info/$PLAINLINK">Info</a>] [<a href="$PLAINLINK">Download</a>]</td></tr>
  
  
  
***************
*** 917,922 ****
--- 917,933 ----
  
  ##
  #
+ # You can specify a file to look at in each directory for extra HTML
+ # to be displayed wherever the tag $INFOTXT is included in your template.
+ # Typically this is used to display cover images, include liner notes,
+ # and possibly links to other websites.
+ #
+ ##
+ infotxt_file = info.html
+ 
+ 
+ ##
+ #
  #  Make it possible to hide song tags, and just display filenames.
  #
  ##
*** /etc/gnump3d/mime.types.000	Sun Apr 22 10:19:10 2007
--- /etc/gnump3d/mime.types	Fri May 25 15:36:38 2007
***************
*** 728,730 ****
--- 728,732 ----
  x-conference/x-cooltalk				ice
  
  x-world/x-vrml					vrm vrml wrl
+ 
+ application/ogg					ogg wav flac wma m4a mpc mp3