OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI, libobs, obs-plugins: Fix compiler warnings

Browse source 
Found warnings when compiling OBS.
This commit is contained in:
Clayton Groeneveld 2021-11-03 13:14:46 -05:00 committed by Jim
parent c565bcaf54
commit af6c719139
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
UI/window-basic-main.cpp
View file

@ -386,7 +386,7 @@ OBSBasic::OBSBasic(QWidget *parent)
// Register shortcuts for Undo/Redo
ui->actionMainUndo->setShortcut(Qt::CTRL + Qt::Key_Z);
QList<QKeySequence> shrt;
shrt << QKeySequence(Qt::CTRL | Qt::SHIFT + Qt::Key_Z)
shrt << QKeySequence((Qt::CTRL | Qt::SHIFT) + Qt::Key_Z)
<< QKeySequence(Qt::CTRL + Qt::Key_Y);
ui->actionMainRedo->setShortcuts(shrt);
@ -6329,7 +6329,7 @@ void OBSBasic::StartStreaming()
void OBSBasic::BroadcastButtonClicked()
{
if (!broadcastReady ||
!broadcastActive && !outputHandler->StreamingActive()) {
(!broadcastActive && !outputHandler->StreamingActive())) {
SetupBroadcast();
if (broadcastReady)
ui->broadcastButton->setChecked(true);

4
UI/window-basic-settings.cpp
View file

@ -4382,10 +4382,10 @@ bool OBSBasicSettings::ScanDuplicateHotkeys(QFormLayout *layout)
edit->hasDuplicate = false;
}
for (int i = 0; i < items.size(); i++) {
for (size_t i = 0; i < items.size(); i++) {
OBSHotkeyLabel *item1 = items[i];
for (int j = i + 1; j < items.size(); j++)
for (size_t j = i + 1; j < items.size(); j++)
hasDupes |= MarkHotkeyConflicts(item1, items[j]);
}

4
UI/window-youtube-actions.hpp
View file

@ -74,9 +74,9 @@ private:
QString selectedBroadcast;
bool autostart, autostop;
bool valid = false;
bool broadcastReady = false;
YoutubeApiWrappers *apiYouTube;
WorkerThread *workerThread;
WorkerThread *workerThread = nullptr;
bool broadcastReady = false;
QString thumbnailFile;
QIcon thumbPlaceholder;
};

2
UI/youtube-api-wrappers.cpp
View file

@ -152,7 +152,7 @@ bool YoutubeApiWrappers::InsertCommand(const char *url,
if (json_out.object_items().find("error") !=
json_out.object_items().end()) {
blog(LOG_ERROR,
"YouTube API error:\n\tHTTP status: %d\n\tURL: %s\n\tJSON: %s",
"YouTube API error:\n\tHTTP status: %ld\n\tURL: %s\n\tJSON: %s",
error_code, url, json_out.dump().c_str());
lastError = json_out["error"]["code"].int_value();

2
libobs/obs-audio-controls.c
View file

@ -783,8 +783,6 @@ obs_volmeter_t *obs_volmeter_create(enum obs_fader_type type)
volmeter->type = type;
obs_volmeter_set_update_interval(volmeter, 50);
return volmeter;
fail:
obs_volmeter_destroy(volmeter);

4
plugins/obs-ffmpeg/obs-ffmpeg-av1.c
View file

@ -333,7 +333,7 @@ static inline void copy_data(AVFrame *pic, const struct encoder_frame *frame,
}
}
#define SEC_TO_NSEC 1000000000ULL
#define SEC_TO_NSEC 1000000000LL
#define TIMEOUT_MAX_SEC 5
#define TIMEOUT_MAX_NSEC (TIMEOUT_MAX_SEC * SEC_TO_NSEC)
static const AVRational nsec_timebase = {1, 1000000000};
@ -374,7 +374,7 @@ static bool av1_encode(void *data, struct encoder_frame *frame,
enc->context->extradata,
enc->context->extradata_size);
} else {
for (size_t i = 0; i < av_pkt.side_data_elems;
for (int i = 0; i < av_pkt.side_data_elems;
i++) {
AVPacketSideData *side_data =
av_pkt.side_data + i;

2
plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c
View file

@ -92,6 +92,8 @@ static void set_psycho_aq(struct nvenc_encoder *enc, bool psycho_aq)
static bool nvenc_init_codec(struct nvenc_encoder *enc, bool psycho_aq)
{
UNUSED_PARAMETER(psycho_aq);
int ret;
// avcodec_open2 will overwrite priv_data, we call this to get a