From cbc9bed8ae85af36ad8579476ab91e89c3cd310e Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 9 Jul 2009 17:16:05 +0200
Subject: move libudev based code into libapt cdrom.cc class

---
 apt-pkg/cdrom.h | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'apt-pkg/cdrom.h')

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 68d61c098..13e7203f4 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -67,5 +67,41 @@ class pkgCdrom
 };
 
 
+// class that uses libudev to find cdrom devices dynamically
+struct CdromDevice
+{
+   string DeviceName;
+   bool Mounted;
+   string MountPath;
+};
+
+class pkgUdevCdromDevices
+{
+ protected:
+   // libudev dlopen stucture
+   void *libudev_handle;
+   struct udev* (*udev_new)(void);
+   int (*udev_enumerate_add_match_property)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
+   int (*udev_enumerate_scan_devices)(struct udev_enumerate *udev_enumerate);
+   struct udev_list_entry* (*udev_enumerate_get_list_entry)(struct udev_enumerate *udev_enumerate);
+   struct udev_device* (*udev_device_new_from_syspath)(struct udev *udev, const char *syspath);
+   struct udev* (*udev_enumerate_get_udev)(struct udev_enumerate *udev_enumerate);
+   const char* (*udev_list_entry_get_name)(struct udev_list_entry *list_entry);
+   const char* (*udev_device_get_devnode)(struct udev_device *udev_device);
+   struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
+   struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
+   const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key);
+   // end libudev dlopen
+   
+ public:
+   pkgUdevCdromDevices();
+   virtual ~pkgUdevCdromDevices();
+
+   // try to open 
+   bool Dlopen();
+   vector<CdromDevice> Scan();
+};
+
+
 
 #endif
-- 
cgit v1.2.3


From 49cb36fc56225b02b4c39aea43095de15da75217 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 22 Jul 2009 18:32:08 +0200
Subject: methods/cdrom.cc: move the scan into the loop that waits for a CD

---
 apt-pkg/cdrom.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apt-pkg/cdrom.h')

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 13e7203f4..74667297e 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -77,6 +77,8 @@ struct CdromDevice
 
 class pkgUdevCdromDevices
 {
+ private:
+   bool Dlopened;
  protected:
    // libudev dlopen stucture
    void *libudev_handle;
-- 
cgit v1.2.3


From 76fe5db7153957f8fda437e3bd614312b076f19e Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 23 Jul 2009 09:47:41 +0200
Subject: methods/cdrom.cc: add AutoDetectAndMount method

---
 apt-pkg/cdrom.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'apt-pkg/cdrom.h')

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 74667297e..13e7203f4 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -77,8 +77,6 @@ struct CdromDevice
 
 class pkgUdevCdromDevices
 {
- private:
-   bool Dlopened;
  protected:
    // libudev dlopen stucture
    void *libudev_handle;
-- 
cgit v1.2.3