diff options
| author | Michael Vogt <mvo@debian.org> | 2011-03-10 11:31:34 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2011-03-10 11:31:34 +0100 |
| commit | 5039a4c529d8c62bfd770fe90347a7805f31724a (patch) | |
| tree | f6414e867aa5827cc94313a67546d7a79e902bad /apt-pkg/cdrom.h | |
| parent | e9ecab0f97be19326c52f2afe04fd9b44eba01ae (diff) | |
| parent | c9952021ba65db0581f6053cd6d6e8bf7d563e8f (diff) | |
merged the lp:~mvo/apt/mvo branch
Diffstat (limited to 'apt-pkg/cdrom.h')
| -rw-r--r-- | apt-pkg/cdrom.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h index 14ca1d810..032fae755 100644 --- a/apt-pkg/cdrom.h +++ b/apt-pkg/cdrom.h @@ -68,7 +68,7 @@ class pkgCdrom /*{{{*/ /*}}}*/ -// class that uses libudev to find cdrom devices dynamically +// class that uses libudev to find cdrom/removable devices dynamically struct CdromDevice /*{{{*/ { string DeviceName; @@ -92,6 +92,7 @@ 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); + int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value); // end libudev dlopen public: @@ -100,7 +101,12 @@ class pkgUdevCdromDevices /*{{{*/ // try to open bool Dlopen(); + + // this is the new interface + vector<CdromDevice> ScanForRemovable(bool CdromOnly); + // FIXME: compat with the old interface/API/ABI only vector<CdromDevice> Scan(); + }; /*}}}*/ |