Re: all you MP3 people out there... a fix for lars!

[Matt Simmons <simmonmt@acm.org>]

Could you add this diff to cddb.el?  It adds support for galette, a
CDDA ripper for Solaris.

I've been trying to use socks.el, and I keep running into the
`Connection not allowed by ruleset' message.  What does it mean?  Is
it something on my end, or is it something in the proxy?

Matt

--- cddb/cddb.el	Tue Nov  3 23:48:36 1998
+++ cddb.el	Tue Nov  3 23:49:29 1998
@@ -34,6 +34,9 @@
 (defvar cddb-cdda2wav-program "cdda2wav"
   "*Where to find the cdda2wav program.")
 
+(defvar cddb-galette-program "galette"
+  "*where to find the galette program.")
+
 (defvar cddb-cdda2wav-arguments '("-N" "-t" "1" "-d" "1")
   "*Arguments to pass to cdda2wav to get CD track information.")
 
@@ -58,7 +61,8 @@
 
 (defvar cddb-possible-probe-programs
   '((cddb-cdparanoia-program . cddb-cdparanoia-get-info)
-    (cddb-cdda2wav-program . cddb-cdda2wav-get-info))
+    (cddb-cdda2wav-program . cddb-cdda2wav-get-info)
+    (cddb-galette-program . cddb-galette-get-info))
   "*Possible programs to probe for CD characteristics.
 This is used if you have not explicitly set `cddb-cd-query-function'.
 
@@ -118,6 +122,49 @@
 	    tracks
 	    length
 	    track-info))))
+
+(defun cddb-galette-get-info (&optional device)
+  "Extract information about a CD using galette.
+Returns a list (DISKCD TRACKS LENGTH TRACKINFO)
+
+DISCID - the CDDB discid of the cd
+TRACKS - the # of tracks on the cd
+LENGTH - the total running time of the cd (in seconds)
+TRACKINFO - a list of the frame offsets of each track
+"
+
+  (save-excursion
+    (set-buffer (get-buffer-create " *galette*"))
+    (erase-buffer)
+    (let ((exit-status (if device
+			   (call-process cddb-galette-program nil t nil "-d" device "-i")
+			 (call-process cddb-galette-program nil t nil "-i")))
+	  (track-info nil)
+	  (length 0)
+	  (num-tracks 0)
+	  (discid nil))
+      (if (/= exit-status 0)
+	  (error "Could not execute `%s'" cddb-galette-program))
+      (goto-char (point-min))
+      
+      ;; Get the frame offsets
+      (while (re-search-forward "^CDROM: |\\s *[0-9]+ | AUDIO |\\s *\\([0-9]+\\) |" nil t)
+	(push (string-to-int (match-string 1)) track-info)
+	(setq num-tracks (1+ num-tracks)))
+      (setq track-info (reverse track-info))
+      
+      ;; Get the disk length.  Easier to divide frames by 75 than to parse
+      ;; mm:ss, so grab the frames
+      (re-search-forward "^CDROM: | TOTAL |\\s +|\\s *\\([0-9]+\\) |" nil t)
+      (setq length (/ (string-to-int (match-string 1)) 75))
+
+      (message (match-string 1))
+      
+      ;; Get the disk ID
+      (re-search-forward "^CDROM: disk id = \\([a-f0-9]+\\)" nil t)
+      (setq discid (match-string 1))
+
+      (list discid num-tracks length track-info))))
 
 (defun cddb-cdda2wav-get-info (&optional device)
   "Extractinformation about a cd using cdda2wav.


-- 
     Matt Simmons  -  simmonmt@acm.org  -  http://www.netcom.com/~simmonmt
      Always take time to stop and smell the roses... and sooner or later,
			      you'll inhale a bee.