Rename setSpeed(const char*,int) to avoid hiding setSpeed(int)

MythTV · Nov 28, 2012 · 9e015cd · 9e015cd
1 parent f8cb433
commit 9e015cd
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 33 deletions.
diff --git a/mythtv/libs/libmyth/mythmediamonitor.cpp b/mythtv/libs/libmyth/mythmediamonitor.cpp
@@ -97,7 +97,7 @@ void MediaMonitor::SetCDSpeed(const char *device, int speed)
     MythCDROM *cd = MythCDROM::get(NULL, device, false, false);
     if (cd)
     {
-        cd->setSpeed(device, speed);
+        cd->setDeviceSpeed(device, speed);
         delete cd;
         return;
     }

diff --git a/mythtv/libs/libmythbase/mythcdrom-darwin.cpp b/mythtv/libs/libmythbase/mythcdrom-darwin.cpp
@@ -18,8 +18,7 @@ class MythCDROMDarwin: public MythCDROM
                     bool SuperMount, bool AllowEject):
         MythCDROM(par, DevicePath, SuperMount, AllowEject) {};
 
-    virtual void       setSpeed(int speed);
-    virtual void       setSpeed(const char *device, int speed);
+    virtual void setDeviceSpeed(const char *device, int speed);
 };
 
 MythCDROM *GetMythCDROMDarwin(QObject* par, const char* devicePath,
@@ -28,12 +27,7 @@ MythCDROM *GetMythCDROMDarwin(QObject* par, const char* devicePath,
     return new MythCDROMDarwin(par, devicePath, SuperMount, AllowEject);
 }
 
-void MythCDROMDarwin::setSpeed(int speed)
-{
-    MythCDROMDarwin::setSpeed(m_DevicePath.toLocal8Bit().constData(), speed);
-}
-
-void MythCDROMDarwin::setSpeed(const char *device, int speed)
+void MythCDROMDarwin::setDeviceSpeed(const char *device, int speed)
 {
     int       fd;
     QString   raw = device;
@@ -43,18 +37,21 @@ void MythCDROMDarwin::setSpeed(const char *device, int speed)
     fd = open(raw.toLocal8Bit().constData(), O_RDONLY | O_NONBLOCK);
     if (fd == -1)
     {
-        LOG(VB_MEDIA, LOG_ERR, LOC + "setSpeed() can't open drive " + raw);
+        LOG(VB_MEDIA, LOG_ERR, LOC +
+            "setDeviceSpeed() can't open drive " + raw);
         return;
     }
 
     if (ioctl(fd, DKIOCCDSETSPEED, &spd) == -1 &&
         ioctl(fd, DKIOCDVDSETSPEED, &spd) == -1)
     {
-        LOG(VB_MEDIA, LOG_ERR, LOC + "setSpeed() failed: " + ENO);
+        LOG(VB_MEDIA, LOG_ERR, LOC + "setDeviceSpeed() failed: " + ENO);
         close(fd);
         return;
     }
-    LOG(VB_MEDIA, LOG_INFO, LOC + ":setSpeed() - CD/DVD speed now " +
-                            QString::number(spd));
+
+    LOG(VB_MEDIA, LOG_INFO, LOC + "setDeviceSpeed() - CD/DVD speed now " +
+        QString::number(spd));
+
     close(fd);
 }
diff --git a/mythtv/libs/libmythbase/mythcdrom-linux.cpp b/mythtv/libs/libmythbase/mythcdrom-linux.cpp
@@ -138,8 +138,7 @@ class MythCDROMLinux: public MythCDROM
     virtual bool checkOK(void);
     virtual MythMediaStatus checkMedia(void);
     virtual MythMediaError eject(bool open_close = true);
-    virtual void setSpeed(int speed);
-    virtual void setSpeed(const char *device, int speed);
+    virtual void setDeviceSpeed(const char *device, int speed);
     virtual bool isSameDevice(const QString &path);
     virtual MythMediaError lock(void);
     virtual MythMediaError unlock(void);
@@ -665,12 +664,7 @@ bool MythCDROMLinux::isSameDevice(const QString &path)
 /*
  * \brief obtained from the mplayer project
  */
-void MythCDROMLinux::setSpeed(int speed)
-{
-    MythCDROMLinux::setSpeed(m_DevicePath.toLocal8Bit().constData(), speed);
-}
-
-void MythCDROMLinux::setSpeed(const char *device, int speed)
+void MythCDROMLinux::setDeviceSpeed(const char *device, int speed)
 {
     int fd;
     unsigned char buffer[28];
@@ -697,14 +691,16 @@ void MythCDROMLinux::setSpeed(const char *device, int speed)
     {
         close(fd);
         LOG(VB_MEDIA, LOG_ERR, LOC +
-            QString(":setSpeed() Failed. device %1 not found") .arg(device));
+            QString(":setDeviceSpeed() Failed. device %1 not found")
+            .arg(device));
         return;
     }
 
     if (!S_ISBLK(st.st_mode))
     {
         close(fd);
-        LOG(VB_MEDIA, LOG_ERR, LOC + ":setSpeed() Failed. Not a block device");
+        LOG(VB_MEDIA, LOG_ERR, LOC +
+            ":setDeviceSpeed() Failed. Not a block device");
         return;
     }
 
@@ -721,7 +717,7 @@ void MythCDROMLinux::setSpeed(const char *device, int speed)
             rate = 0;
             buffer[0] = 4;
             LOG(VB_MEDIA, LOG_INFO, LOC + 
-                ":setSpeed() - Restored CD/DVD Speed");
+                ":setDeviceSpeed() - Restored CD/DVD Speed");
             break;
         }
         default:
@@ -732,7 +728,7 @@ void MythCDROMLinux::setSpeed(const char *device, int speed)
             rate = (speed > 0 && speed < 100) ? speed * 177 : speed;
 
             LOG(VB_MEDIA, LOG_INFO, LOC +
-                QString(":setSpeed() - Limiting CD/DVD Speed to %1KB/s")
+                QString(":setDeviceSpeed() - Limiting CD/DVD Speed to %1KB/s")
                     .arg(rate));
             break;
         }
@@ -779,7 +775,7 @@ void MythCDROMLinux::setSpeed(const char *device, int speed)
                 " Limit CD/DVD CDROM_SELECT_SPEED Failed");
         }
         LOG(VB_MEDIA, LOG_INFO, LOC +
-            ":setSpeed() - CD/DVD Speed Set Successful");
+            ":setDeviceSpeed() - CD/DVD Speed Set Successful");
     }
 
     close(fd);

diff --git a/mythtv/libs/libmythbase/mythcdrom.cpp b/mythtv/libs/libmythbase/mythcdrom.cpp
@@ -125,9 +125,9 @@ void MythCDROM::onDeviceMounted()
     }
 }
 
-void MythCDROM::setSpeed(const char *devicePath, int speed)
+void MythCDROM::setDeviceSpeed(const char *devicePath, int speed)
 {
     LOG(VB_MEDIA, LOG_INFO, 
-        QString("SetSpeed(%1,%2) - not implemented on this OS.")
-                      .arg(devicePath).arg(speed));
+        QString("SetDeviceSpeed(%1,%2) - not implemented on this OS.")
+        .arg(devicePath).arg(speed));
 }
diff --git a/mythtv/libs/libmythbase/mythcdrom.h b/mythtv/libs/libmythbase/mythcdrom.h
@@ -18,7 +18,7 @@ class MBASE_PUBLIC MythCDROM : public MythMediaDevice
     {
         return setStatus(MEDIASTAT_UNKNOWN, false);
     }
-    virtual void setSpeed(const char *devicePath, int speed);
+    virtual void setDeviceSpeed(const char *devicePath, int speed);
 
     static MythCDROM* get(QObject* par, const char* devicePath,
                                   bool SuperMount, bool AllowEject);

diff --git a/mythtv/libs/libmythbase/mythmedia.cpp b/mythtv/libs/libmythbase/mythmedia.cpp
@@ -324,9 +324,7 @@ bool MythMediaDevice::isSameDevice(const QString &path)
 
 void MythMediaDevice::setSpeed(int speed)
 {
-    LOG(VB_MEDIA, LOG_ERR,
-            QString("Cannot setSpeed(%1) for device %2 - not implemented.")
-            .arg(speed).arg(m_DevicePath));
+    setDeviceSpeed(m_DevicePath.toLocal8Bit().constData(), speed);
 }
 
 MythMediaError MythMediaDevice::lock()

diff --git a/mythtv/libs/libmythbase/mythmedia.h b/mythtv/libs/libmythbase/mythmedia.h
@@ -97,6 +97,7 @@ class MBASE_PUBLIC MythMediaDevice : public QObject
     virtual bool closeDevice();
     virtual bool isSameDevice(const QString &path);
     virtual void setSpeed(int speed);
+    virtual void setDeviceSpeed(const char *devicePath, int speed) { }
     virtual MythMediaStatus checkMedia() = 0;// Derived classes MUST implement this.
     virtual MythMediaError eject(bool open_close = true);
     virtual MythMediaError lock();