Changeset 22063 in project

Timestamp:

12/18/10 00:09:53 (10 years ago)

Author:

Moritz Heidkamp

Message:

pulseaudio: add error enum and error->string; use those to handle no-entity errors

Location:

release/4/pulseaudio/trunk

Files:

• pulseaudio-lolevel.scm (modified) (2 diffs)
• types.scm (modified) (1 diff)

release/4/pulseaudio/trunk/pulseaudio-lolevel.scm

@@ -81 +81 @@
 (define (handle-eol callback context info eol)
   (cond ((> eol 0) #t)
-        ((< eol 0) (error (format "eol error on callback for ~A" (context-pointer context))))
+        ((< eol 0)
+         (if (eq? 'no-entity (int->error eol))
+             (callback context #f)
+             (error (format "eol error on callback for ~A: ~A" 
+                            (context-pointer context)
+                            (error->string eol)))))
         (else (callback context info) #f)))
 
@@ -104 +109 @@
      ;; additional finalizers are prepended, see ticket #446
      (set-finalizer! c free-context-state-callback)
+     (set-finalizer! c free-context-subscribe-callback)
      (set-finalizer! c free-context-subscribe-callback))
    make-context))

release/4/pulseaudio/trunk/types.scm

@@ -237 +237 @@
   (int->subscription-event (bitwise-and se se/type-mask)))
 
+(define-foreign-enum-type (error int)
+  (error->int int->error)
+  ((ok) PA_OK)
+  ((access) PA_ERR_ACCESS)
+  ((command) PA_ERR_COMMAND)
+  ((invalid) PA_ERR_INVALID)
+  ((exist) PA_ERR_EXIST)
+  ((no-entity) PA_ERR_NOENTITY)
+  ((connection-refused) PA_ERR_CONNECTIONREFUSED)
+  ((protocol) PA_ERR_PROTOCOL)
+  ((timeout) PA_ERR_TIMEOUT)
+  ((authkey) PA_ERR_AUTHKEY)
+  ((internal) PA_ERR_INTERNAL)
+  ((connection-terminated) PA_ERR_CONNECTIONTERMINATED)
+  ((killed) PA_ERR_KILLED)
+  ((invalid-server) PA_ERR_INVALIDSERVER)
+  ((mod-init-failed) PA_ERR_MODINITFAILED)
+  ((bad-state) PA_ERR_BADSTATE)
+  ((no-data) PA_ERR_NODATA)
+  ((version) PA_ERR_VERSION)
+  ((too-large) PA_ERR_TOOLARGE)
+  ((not-supported) PA_ERR_NOTSUPPORTED)
+  ((unknown) PA_ERR_UNKNOWN)
+  ((no-extension) PA_ERR_NOEXTENSION)
+  ((obsolete) PA_ERR_OBSOLETE)
+  ((not-implemented) PA_ERR_NOTIMPLEMENTED)
+  ((forked) PA_ERR_FORKED)
+  ((io) PA_ERR_IO)
+  ((busy) PA_ERR_BUSY)
+  ((max) PA_ERR_MAX))
+
+(define (error->string error)
+  ((foreign-lambda c-string pa_strerror int) error))
+
 (define properties
   (let-syntax ((p (syntax-rules () ((_ n) (foreign-value n c-string)))))