Browse Source

refactor: Comply with Clang's Wunused-parameter

reviewable/pr6571/r7
Anthony Bilinski 4 years ago
parent
commit
73aa1f3f48
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
  1. 6
      src/video/cameradevice.cpp
  2. 4
      src/video/cameradevice.h
  3. 2
      src/video/camerasource.cpp

6
src/video/cameradevice.cpp

@ -86,7 +86,7 @@ CameraDevice::CameraDevice(const QString& devName_, AVFormatContext* context_) @@ -86,7 +86,7 @@ CameraDevice::CameraDevice(const QString& devName_, AVFormatContext* context_)
{
}
CameraDevice* CameraDevice::open(Settings& settings, QString devName, AVDictionary** options)
CameraDevice* CameraDevice::open(QString devName, AVDictionary** options)
{
openDeviceLock.lock();
AVFormatContext* fctx = nullptr;
@ -151,7 +151,7 @@ out: @@ -151,7 +151,7 @@ out:
* @param mode Mode of device to open.
* @return CameraDevice if the device could be opened, nullptr otherwise.
*/
CameraDevice* CameraDevice::open(Settings& settings, QString devName, VideoMode mode)
CameraDevice* CameraDevice::open(QString devName, VideoMode mode)
{
if (!getDefaultInputFormat())
return nullptr;
@ -237,7 +237,7 @@ CameraDevice* CameraDevice::open(Settings& settings, QString devName, VideoMode @@ -237,7 +237,7 @@ CameraDevice* CameraDevice::open(Settings& settings, QString devName, VideoMode
std::ignore = mode;
}
CameraDevice* dev = open(settings, devName, &options);
CameraDevice* dev = open(devName, &options);
if (options) {
av_dict_free(&options);
}

4
src/video/cameradevice.h

@ -36,7 +36,7 @@ class Settings; @@ -36,7 +36,7 @@ class Settings;
class CameraDevice
{
public:
static CameraDevice* open(Settings& settings, QString devName, VideoMode mode = VideoMode());
static CameraDevice* open(QString devName, VideoMode mode = VideoMode());
void open();
bool close();
@ -52,7 +52,7 @@ public: @@ -52,7 +52,7 @@ public:
private:
CameraDevice(const QString& devName_, AVFormatContext* context_);
static CameraDevice* open(Settings& settings, QString devName, AVDictionary** options);
static CameraDevice* open(QString devName, AVDictionary** options);
static bool getDefaultInputFormat();
static QVector<QPair<QString, QString>> getRawDeviceListGeneric();
static QVector<VideoMode> getScreenModes();

2
src/video/camerasource.cpp

@ -261,7 +261,7 @@ void CameraSource::openDevice() @@ -261,7 +261,7 @@ void CameraSource::openDevice()
}
// We need to create a new CameraDevice
device = CameraDevice::open(settings, deviceName, mode);
device = CameraDevice::open(deviceName, mode);
if (!device) {
qWarning() << "Failed to open device!";

Loading…
Cancel
Save