diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-09-09 17:00:12 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2010-09-09 17:00:12 +0000 |
| commit | 6d6e64be9d361ca126aad15fc7361addfaddf439 (patch) | |
| tree | 367b58466fcb6f685e138344610879631bf9df16 /src/plugins | |
| parent | 7135cbf5a06ec6b74b85ee851e6ead90607f1fdc (diff) | |
| download | qmmp-6d6e64be9d361ca126aad15fc7361addfaddf439.tar.gz qmmp-6d6e64be9d361ca126aad15fc7361addfaddf439.tar.bz2 qmmp-6d6e64be9d361ca126aad15fc7361addfaddf439.zip | |
UDisks plugin: fixed cd/dvd detection; Hal plugin: added iso9660 detection
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1881 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/General/hal/halplugin.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/General/udisks/udisksmanager.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/General/udisks/udisksmanager.h | 1 | ||||
| -rw-r--r-- | src/plugins/General/udisks/udisksplugin.cpp | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp index 49a9faacb..98c06b2fc 100644 --- a/src/plugins/General/hal/halplugin.cpp +++ b/src/plugins/General/hal/halplugin.cpp @@ -121,7 +121,8 @@ void HalPlugin::addDevice(const QString &udi) (device->property("volume.fstype").toString() == "vfat" || device->property("volume.fstype").toString() == "iso" || device->property("volume.fstype").toString() == "udf" || - device->property("volume.fstype").toString() == "ext2")) + device->property("volume.fstype").toString() == "ext2" || + device->property("volume.fstype").toString() == "iso9660")) { if (m_detectRemovable) { diff --git a/src/plugins/General/udisks/udisksmanager.cpp b/src/plugins/General/udisks/udisksmanager.cpp index a05b4d0ad..2062aa38a 100644 --- a/src/plugins/General/udisks/udisksmanager.cpp +++ b/src/plugins/General/udisks/udisksmanager.cpp @@ -38,6 +38,10 @@ UDisksManager::UDisksManager(QObject *parent) "org.freedesktop.UDisks", "DeviceRemoved", this, SIGNAL(deviceRemoved(QDBusObjectPath))); + m_interface->connection().connect("org.freedesktop.UDisks", "/org/freedesktop/UDisks", + "org.freedesktop.UDisks", "DeviceChanged", + this, SIGNAL(deviceChanged(QDBusObjectPath))); + } diff --git a/src/plugins/General/udisks/udisksmanager.h b/src/plugins/General/udisks/udisksmanager.h index fb6795b1d..a8ee4cdda 100644 --- a/src/plugins/General/udisks/udisksmanager.h +++ b/src/plugins/General/udisks/udisksmanager.h @@ -42,6 +42,7 @@ public: signals: void deviceAdded(QDBusObjectPath); void deviceRemoved(QDBusObjectPath); + void deviceChanged(QDBusObjectPath); private: QDBusInterface *m_interface; diff --git a/src/plugins/General/udisks/udisksplugin.cpp b/src/plugins/General/udisks/udisksplugin.cpp index 1683f095b..19cce37a4 100644 --- a/src/plugins/General/udisks/udisksplugin.cpp +++ b/src/plugins/General/udisks/udisksplugin.cpp @@ -35,6 +35,7 @@ UDisksPlugin::UDisksPlugin(QObject *parent) m_manager = new UDisksManager(this); m_actions = new QActionGroup(this); connect(m_manager,SIGNAL(deviceAdded(QDBusObjectPath)), SLOT(addDevice(QDBusObjectPath))); + connect(m_manager,SIGNAL(deviceChanged(QDBusObjectPath)), SLOT(addDevice(QDBusObjectPath))); connect(m_manager,SIGNAL(deviceRemoved(QDBusObjectPath)), SLOT(removeDevice(QDBusObjectPath))); connect(m_actions,SIGNAL(triggered (QAction *)), SLOT(processAction(QAction *))); //load settings |