X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/49cb36fc56225b02b4c39aea43095de15da75217..590f1923121815b36ef889033c1c416a23cbe9a2:/apt-pkg/cdrom.h

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 74667297e..e83c38582 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -8,7 +8,7 @@
 
 using namespace std;
 
-class pkgCdromStatus
+class pkgCdromStatus							/*{{{*/
 {
  protected:
    int totalSteps;
@@ -29,8 +29,8 @@ class pkgCdromStatus
    // Progress indicator for the Index rewriter
    virtual OpProgress* GetOpProgress() {return NULL; };
 };
-
-class pkgCdrom 
+									/*}}}*/
+class pkgCdrom								/*{{{*/
 {
  protected:
    enum {
@@ -65,20 +65,19 @@ class pkgCdrom
    bool Ident(string &ident, pkgCdromStatus *log);
    bool Add(pkgCdromStatus *log);
 };
+									/*}}}*/
 
 
-// class that uses libudev to find cdrom devices dynamically
-struct CdromDevice
+// class that uses libudev to find cdrom/removable devices dynamically
+struct CdromDevice							/*{{{*/
 {
    string DeviceName;
    bool Mounted;
    string MountPath;
 };
-
-class pkgUdevCdromDevices
+									/*}}}*/
+class pkgUdevCdromDevices						/*{{{*/
 {
- private:
-   bool Dlopened;
  protected:
    // libudev dlopen stucture
    void *libudev_handle;
@@ -93,6 +92,9 @@ class pkgUdevCdromDevices
    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);
+#if 0 // FIXME: uncomment on next ABI break
+   int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
+#endif 
    // end libudev dlopen
    
  public:
@@ -101,9 +103,13 @@ class pkgUdevCdromDevices
 
    // try to open 
    bool Dlopen();
-   vector<CdromDevice> Scan();
-};
 
+   // this is the new interface
+   vector<CdromDevice> ScanForRemovable(bool CdromOnly);
+   // FIXME: compat with the old interface/API/ABI only
+   vector<CdromDevice> Scan();
 
+};
+									/*}}}*/
 
 #endif