Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions UI/forms/OBSYoutubeActions.ui
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>720</width>
<height>880</height>
</size>
</property>
<property name="windowTitle">
<string>YouTube.Actions.WindowTitle</string>
</property>
Expand Down
15 changes: 9 additions & 6 deletions UI/obs-app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -389,21 +389,24 @@ static void do_log(int log_level, const char *msg, va_list args, void *param)
OutputDebugStringW(wide_buf.c_str());
}
}
#else
def_log_handler(log_level, msg, args2, nullptr);
va_end(args2);
#endif

if (log_level <= LOG_INFO || log_verbose) {
if (too_many_repeated_entries(logFile, msg, str))
return;
LogStringChunk(logFile, str, log_level);
#ifndef _WIN32
def_log_handler(log_level, msg, args2, nullptr);
#endif
if (!too_many_repeated_entries(logFile, msg, str))
LogStringChunk(logFile, str, log_level);
}

#if defined(_WIN32) && defined(OBS_DEBUGBREAK_ON_ERROR)
if (log_level <= LOG_ERROR && IsDebuggerPresent())
__debugbreak();
#endif

#ifndef _WIN32
va_end(args2);
#endif
}

#define DEFAULT_LANG "en-US"
Expand Down
13 changes: 8 additions & 5 deletions UI/window-basic-main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4695,6 +4695,7 @@ void OBSBasic::changeEvent(QEvent *event)
if (trayIcon && trayIcon->isVisible() &&
sysTrayMinimizeToTray()) {
ToggleShowHide();
return;
}

if (previewEnabled)
Expand Down Expand Up @@ -8881,9 +8882,10 @@ void OBSBasic::SetShowing(bool showing)

if (showHide)
showHide->setText(QTStr("Basic.SystemTray.Show"));
QTimer::singleShot(250, this, SLOT(hide()));
QTimer::singleShot(0, this, SLOT(hide()));

setVisible(false);
if (previewEnabled)
EnablePreviewDisplay(false);

#ifdef __APPLE__
EnableOSXDockIcon(false);
Expand All @@ -8892,9 +8894,10 @@ void OBSBasic::SetShowing(bool showing)
} else if (showing && !isVisible()) {
if (showHide)
showHide->setText(QTStr("Basic.SystemTray.Hide"));
QTimer::singleShot(250, this, SLOT(show()));
QTimer::singleShot(0, this, SLOT(show()));

setVisible(true);
if (previewEnabled)
EnablePreviewDisplay(true);

#ifdef __APPLE__
EnableOSXDockIcon(true);
Expand Down Expand Up @@ -9974,7 +9977,7 @@ void OBSBasic::SetDisplayAffinity(QWindow *window)
if (GetWindowDisplayAffinity(hwnd, &curAffinity)) {
if (hideFromCapture && curAffinity != WDA_EXCLUDEFROMCAPTURE)
SetWindowDisplayAffinity(hwnd, WDA_EXCLUDEFROMCAPTURE);
else if (curAffinity != WDA_NONE)
else if (!hideFromCapture && curAffinity != WDA_NONE)
SetWindowDisplayAffinity(hwnd, WDA_NONE);
}

Expand Down
2 changes: 2 additions & 0 deletions UI/window-remux.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,8 @@ OBSRemux::OBSRemux(const char *path, QWidget *parent, bool autoRemux_)
RemuxEntryColumn::State, QHeaderView::ResizeMode::Fixed);
ui->tableView->setEditTriggers(
QAbstractItemView::EditTrigger::CurrentChanged);
ui->tableView->setTextElideMode(Qt::ElideMiddle);
ui->tableView->setWordWrap(false);

installEventFilter(CreateShortcutFilter());

Expand Down
3 changes: 2 additions & 1 deletion libobs/graphics/image-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "image-file.h"
#include "../util/base.h"
#include "../util/platform.h"
#include "../util/dstr.h"
#include "vec4.h"

#define blog(level, format, ...) \
Expand Down Expand Up @@ -206,7 +207,7 @@ static void gs_image_file_init_internal(gs_image_file_t *image,

len = strlen(file);

if (len > 4 && strcmp(file + len - 4, ".gif") == 0) {
if (len > 4 && astrcmpi(file + len - 4, ".gif") == 0) {
if (init_animated_gif(image, file, mem_usage, alpha_mode)) {
return;
}
Expand Down
46 changes: 19 additions & 27 deletions libobs/util/base.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
#include "c99defs.h"
#include "base.h"

#ifdef _DEBUG
static int log_output_level = LOG_DEBUG;
#else
static int log_output_level = LOG_INFO;
#endif

static int crashing = 0;
static void *log_param = NULL;
static void *crash_param = NULL;
Expand All @@ -36,27 +30,25 @@ static void def_log_handler(int log_level, const char *format, va_list args,
char out[4096];
vsnprintf(out, sizeof(out), format, args);

if (log_level <= log_output_level) {
switch (log_level) {
case LOG_DEBUG:
fprintf(stdout, "debug: %s\n", out);
fflush(stdout);
break;

case LOG_INFO:
fprintf(stdout, "info: %s\n", out);
fflush(stdout);
break;

case LOG_WARNING:
fprintf(stdout, "warning: %s\n", out);
fflush(stdout);
break;

case LOG_ERROR:
fprintf(stderr, "error: %s\n", out);
fflush(stderr);
}
switch (log_level) {
case LOG_DEBUG:
fprintf(stdout, "debug: %s\n", out);
fflush(stdout);
break;

case LOG_INFO:
fprintf(stdout, "info: %s\n", out);
fflush(stdout);
break;

case LOG_WARNING:
fprintf(stdout, "warning: %s\n", out);
fflush(stdout);
break;

case LOG_ERROR:
fprintf(stderr, "error: %s\n", out);
fflush(stderr);
}

UNUSED_PARAMETER(param);
Expand Down
4 changes: 3 additions & 1 deletion plugins/linux-capture/pipewire.c
Original file line number Diff line number Diff line change
Expand Up @@ -1434,8 +1434,10 @@ void *obs_pipewire_create(enum obs_pw_capture_type capture_type,
obs_pw->restore_token =
bstrdup(obs_data_get_string(settings, "RestoreToken"));

if (!init_obs_pipewire(obs_pw))
if (!init_obs_pipewire(obs_pw)) {
g_clear_pointer(&obs_pw, bfree);
return NULL;
}

init_format_info(obs_pw);

Expand Down
4 changes: 2 additions & 2 deletions plugins/obs-ffmpeg/obs-ffmpeg-source.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ static void ffmpeg_source_defaults(obs_data_t *settings)
}

static const char *media_filter =
" (*.mp4 *.ts *.mov *.flv *.mkv *.avi *.mp3 *.ogg *.aac *.wav *.gif *.webm);;";
" (*.mp4 *.ts *.mov *.mxf *.flv *.mkv *.avi *.mp3 *.ogg *.aac *.wav *.gif *.webm);;";
static const char *video_filter =
" (*.mp4 *.ts *.mov *.flv *.mkv *.avi *.gif *.webm);;";
" (*.mp4 *.ts *.mov *.mxf *.flv *.mkv *.avi *.gif *.webm);;";
static const char *audio_filter = " (*.mp3 *.aac *.ogg *.wav);;";

static obs_properties_t *ffmpeg_source_getproperties(void *data)
Expand Down