1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

chore: fix some compiler warnings

This commit is contained in:
sudden6 2017-12-10 22:35:03 +01:00
parent d2deec7c55
commit d01999814e
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
3 changed files with 3 additions and 7 deletions

View File

@ -63,12 +63,8 @@ extern "C" {
* the context MUST exit with alProxyContext as active context and MUST not be * the context MUST exit with alProxyContext as active context and MUST not be
* interrupted. For this to work, all functions of the base class modifying the * interrupted. For this to work, all functions of the base class modifying the
* context have to be overriden. * context have to be overriden.
*
* @var BUFFER_COUNT
* @brief Number of buffers to use per audio source
*/ */
static const unsigned int BUFFER_COUNT = 16;
static const unsigned int PROXY_BUFFER_COUNT = 4; static const unsigned int PROXY_BUFFER_COUNT = 4;
#define GET_PROC_ADDR(dev, name) name = reinterpret_cast<LP##name>(alcGetProcAddress(dev, #name)) #define GET_PROC_ADDR(dev, name) name = reinterpret_cast<LP##name>(alcGetProcAddress(dev, #name))

View File

@ -50,7 +50,7 @@ private:
std::atomic_bool stopped; std::atomic_bool stopped;
friend class CoreAV; friend class CoreAV;
friend struct ToxFriendCall; friend class ToxFriendCall;
}; };
#endif // COREVIDEOSOURCE_H #endif // COREVIDEOSOURCE_H

View File

@ -59,7 +59,7 @@ QRect VideoMode::toRect() const
bool VideoMode::operator==(const VideoMode& other) const bool VideoMode::operator==(const VideoMode& other) const
{ {
return width == other.width && height == other.height && x == other.x && y == other.y return width == other.width && height == other.height && x == other.x && y == other.y
&& FPS == other.FPS && pixel_format == other.pixel_format; && qFuzzyCompare(FPS, other.FPS) && pixel_format == other.pixel_format;
} }
uint32_t VideoMode::norm(const VideoMode& other) const uint32_t VideoMode::norm(const VideoMode& other) const
@ -72,5 +72,5 @@ uint32_t VideoMode::norm(const VideoMode& other) const
*/ */
VideoMode::operator bool() const VideoMode::operator bool() const
{ {
return width || height || (FPS < 0); return width || height || static_cast<int>(FPS);
} }