Cleanup: remove unneeded package specifiers.
authorVitaly Mayatskikh <v.mayatskih@gmail.com>
Mon, 7 Sep 2009 10:23:14 +0000 (7 12:23 +0200)
committerVitaly Mayatskikh <v.mayatskih@gmail.com>
Mon, 7 Sep 2009 10:23:14 +0000 (7 12:23 +0200)
videodev2.lisp

index 01f6360..3c01b0b 100644 (file)
              collect
                `(defun ,slot-name (inst)
                   ,(if (or (eq slot-type :char) (eq slot-type :uchar))
-                       `(cffi:convert-from-foreign
-                         (cffi:foreign-slot-value (,raw-accessor inst) ',class-name ',slot) :string)
+                       `(convert-from-foreign
+                         (foreign-slot-value (,raw-accessor inst) ',class-name ',slot) :string)
                        (if (cffi::aggregatep (cffi::parse-type slot-type))
                            `(make-instance ',slot-type
-                                           :pointer (cffi:foreign-slot-value (,raw-accessor inst) ',class-name ',slot))
-                           `(cffi:foreign-slot-value (,raw-accessor inst) ',class-name ',slot))))
+                                           :pointer (foreign-slot-value (,raw-accessor inst) ',class-name ',slot))
+                           `(foreign-slot-value (,raw-accessor inst) ',class-name ',slot))))
              collect
                `(setf (gethash (cons ',class-name ',slot) *v4l2-slot-readers*)
                       (fdefinition ',slot-name))
 
              collect
                `(defun (setf ,slot-name) (new inst)
-                  (setf (cffi:foreign-slot-value (,raw-accessor inst) ',class-name ',slot)
-                        (cffi:convert-to-foreign new ',slot-type)))
+                  (setf (foreign-slot-value (,raw-accessor inst) ',class-name ',slot)
+                        (convert-to-foreign new ',slot-type)))
              collect
                `(setf (gethash (cons ',class-name ',slot) *v4l2-slot-writers*)
                       (fdefinition '(setf ,slot-name))))
 
          (defmethod initialize-instance :after ((inst ,class-name) &key pointer)
-          (let ((obj (or pointer (cffi:foreign-alloc ',class-name))))
+          (let ((obj (or pointer (foreign-alloc ',class-name))))
             (setf (,raw-accessor inst) obj)
             (unless pointer
-              (tg:finalize inst (lambda ()
-                                  (cl:format t "finalize ~A~%" obj)
-                                  (foreign-free obj))))))
+              (finalize inst (lambda ()
+                               (cl:format t "finalize ~A~%" obj)
+                               (foreign-free obj))))))
          ',class-name))))
 
 (defmacro def-c-struct (name &rest args)