* apt-pkg/depcache.cc:

[apt.git] / apt-pkg / cdrom.h

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 13e7203f41c7016e67cebd3cc97e76b4635ff33f..e83c385829bfc965fb3279ff440118198ac371ce 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -8,7 +8,7 @@
 
 using namespace std;
 
 
 using namespace std;
 

-class pkgCdromStatus
+class pkgCdromStatus                                                   /*{{{*/

 {
  protected:
    int totalSteps;
 {
  protected:
    int totalSteps;


@@ -29,8 +29,8 @@ class pkgCdromStatus
    // Progress indicator for the Index rewriter
    virtual OpProgress* GetOpProgress() {return NULL; };
 };
    // Progress indicator for the Index rewriter
    virtual OpProgress* GetOpProgress() {return NULL; };
 };

-
-class pkgCdrom 
+                                                                       /*}}}*/
+class pkgCdrom                                                         /*{{{*/

 {
  protected:
    enum {
 {
  protected:
    enum {


@@ -65,17 +65,18 @@ class pkgCdrom
    bool Ident(string &ident, pkgCdromStatus *log);
    bool Add(pkgCdromStatus *log);
 };
    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;
 };
 {
    string DeviceName;
    bool Mounted;
    string MountPath;
 };

-
-class pkgUdevCdromDevices
+                                                                       /*}}}*/
+class pkgUdevCdromDevices                                              /*{{{*/

 {
  protected:
    // libudev dlopen stucture
 {
  protected:
    // libudev dlopen stucture


@@ -91,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);
    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:
    // end libudev dlopen
    
  public:


@@ -99,9 +103,13 @@ class pkgUdevCdromDevices
 
    // try to open 
    bool Dlopen();
 
    // 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
 
 #endif