opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-01 15:49:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6960 from tytan652/fix_switches

Browse Source 
Switch clean up (remove one-case switch and switch warning workaround)
This commit is contained in:
tt2468
2023-01-16 03:55:48 -08:00
committed by GitHub
parent 78d31322b2 8fad36868e
commit f6d0c63b1e
23 changed files with 66 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/platform-windows.cpp
+25 -26
View File
@@ -465,33 +465,32 @@ void TaskbarOverlaySetStatus(TaskbarOverlayStatus status)
return;
}
if (status != TaskbarOverlayStatusInactive) {
QIcon qicon;
switch (status) {
case TaskbarOverlayStatusActive:
qicon = QIcon::fromTheme(
"obs-active", QIcon(":/res/images/active.png"));
break;
case TaskbarOverlayStatusPaused:
qicon = QIcon::fromTheme(
"obs-paused", QIcon(":/res/images/paused.png"));
break;
}
HICON hicon = nullptr;
if (!qicon.isNull()) {
Q_GUI_EXPORT HICON qt_pixmapToWinHICON(
const QPixmap &p);
hicon = qt_pixmapToWinHICON(
qicon.pixmap(GetSystemMetrics(SM_CXSMICON)));
if (!hicon)
return;
}
taskbarIcon->SetOverlayIcon(hwnd, hicon, nullptr);
DestroyIcon(hicon);
} else {
QIcon qicon;
switch (status) {
case TaskbarOverlayStatusActive:
qicon = QIcon::fromTheme("obs-active",
QIcon(":/res/images/active.png"));
break;
case TaskbarOverlayStatusPaused:
qicon = QIcon::fromTheme("obs-paused",
QIcon(":/res/images/paused.png"));
break;
case TaskbarOverlayStatusInactive:
taskbarIcon->SetOverlayIcon(hwnd, nullptr, nullptr);
taskbarIcon->Release();
return;
}
HICON hicon = nullptr;
if (!qicon.isNull()) {
Q_GUI_EXPORT HICON qt_pixmapToWinHICON(const QPixmap &p);
hicon = qt_pixmapToWinHICON(
qicon.pixmap(GetSystemMetrics(SM_CXSMICON)));
if (!hicon)
return;
}
taskbarIcon->SetOverlayIcon(hwnd, hicon, nullptr);
DestroyIcon(hicon);
taskbarIcon->Release();
}
UI/source-tree.cpp
+3 -1
View File
@@ -636,7 +636,7 @@ void SourceTreeModel::OBSFrontendEvent(enum obs_frontend_event event, void *ptr)
{
SourceTreeModel *stm = reinterpret_cast<SourceTreeModel *>(ptr);
switch ((int)event) {
switch (event) {
case OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED:
stm->SceneChanged();
break;
@@ -644,6 +644,8 @@ void SourceTreeModel::OBSFrontendEvent(enum obs_frontend_event event, void *ptr)
case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP:
stm->Clear();
break;
default:
break;
}
}
UI/window-basic-stats.cpp
+3 -1
View File
@@ -22,13 +22,15 @@ void OBSBasicStats::OBSFrontendEvent(enum obs_frontend_event event, void *ptr)
{
OBSBasicStats *stats = reinterpret_cast<OBSBasicStats *>(ptr);
switch ((int)event) {
switch (event) {
case OBS_FRONTEND_EVENT_RECORDING_STARTED:
stats->StartRecTimeLeft();
break;
case OBS_FRONTEND_EVENT_RECORDING_STOPPED:
stats->ResetRecTimeLeft();
break;
default:
break;
}
}
libobs-d3d11/d3d11-subsystem.hpp
+1 -1
View File
@@ -143,7 +143,7 @@ ConvertGSTextureFormatViewLinear(gs_color_format format)
static inline gs_color_format ConvertDXGITextureFormat(DXGI_FORMAT format)
{
switch ((unsigned long)format) {
switch (format) {
case DXGI_FORMAT_A8_UNORM:
return GS_A8;
case DXGI_FORMAT_R8_UNORM:
libobs-opengl/gl-shader.c
+1 -1
View File
@@ -735,7 +735,7 @@ void gs_shader_set_val(gs_sparam_t *param, const void *val, size_t size)
if (!count)
count = 1;
switch ((uint32_t)param->type) {
switch (param->type) {
case GS_SHADER_PARAM_FLOAT:
expected_size = sizeof(float);
break;
libobs-opengl/gl-windows.c
+3 -3
View File
@@ -39,7 +39,7 @@ struct gl_platform {
/* For now, only support basic 32bit formats for graphics output. */
static inline int get_color_format_bits(enum gs_color_format format)
{
switch ((uint32_t)format) {
switch (format) {
case GS_RGBA:
case GS_BGRA:
return 32;
@@ -50,7 +50,7 @@ static inline int get_color_format_bits(enum gs_color_format format)
static inline int get_depth_format_bits(enum gs_zstencil_format zsformat)
{
switch ((uint32_t)zsformat) {
switch (zsformat) {
case GS_Z16:
return 16;
case GS_Z24_S8:
@@ -62,7 +62,7 @@ static inline int get_depth_format_bits(enum gs_zstencil_format zsformat)
static inline int get_stencil_format_bits(enum gs_zstencil_format zsformat)
{
switch ((uint32_t)zsformat) {
switch (zsformat) {
case GS_Z24_S8:
return 8;
default:
libobs/graphics/graphics-ffmpeg.c
+1 -1
View File
@@ -617,7 +617,7 @@ void gs_free_image_deps(void) {}
static inline enum gs_color_format convert_format(enum AVPixelFormat format)
{
switch ((int)format) {
switch (format) {
case AV_PIX_FMT_RGBA:
return GS_RGBA;
case AV_PIX_FMT_BGRA:
libobs/obs-nix.c
+1 -8
View File
@@ -326,15 +326,8 @@ void log_system_info(void)
log_distribution_info();
log_desktop_session_info();
#endif
switch (obs_get_nix_platform()) {
case OBS_NIX_PLATFORM_X11_EGL:
if (obs_get_nix_platform() == OBS_NIX_PLATFORM_X11_EGL)
obs_nix_x11_log_info();
break;
#ifdef ENABLE_WAYLAND
case OBS_NIX_PLATFORM_WAYLAND:
break;
#endif
}
}
bool obs_hotkeys_platform_init(struct obs_core_hotkeys *hotkeys)
libobs/obs-scene.c
+10 -10
View File
@@ -608,23 +608,27 @@ static void render_item_texture(struct obs_scene_item *item,
float multiplier = 1.f;
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB) {
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
case GS_CS_709_EXTENDED:
multiplier = obs_get_video_sdr_white_level() / 80.f;
break;
case GS_CS_709_SCRGB:
break;
}
}
switch (source_space) {
case GS_CS_709_SCRGB:
if (source_space == GS_CS_709_SCRGB) {
switch (current_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
case GS_CS_709_EXTENDED:
multiplier = 80.f / obs_get_video_sdr_white_level();
break;
case GS_CS_709_SCRGB:
break;
}
}
@@ -634,10 +638,8 @@ static void render_item_texture(struct obs_scene_item *item,
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB)
tech_name = "DrawUpscaleMultiply";
}
break;
case GS_CS_709_EXTENDED:
switch (current_space) {
@@ -663,10 +665,8 @@ static void render_item_texture(struct obs_scene_item *item,
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB)
tech_name = "DrawMultiply";
}
break;
case GS_CS_709_EXTENDED:
switch (current_space) {
libobs/obs-source-deinterlace.c
+1 -2
View File
@@ -386,8 +386,7 @@ void deinterlace_render(obs_source_t *s)
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB) {
tech_name = "DrawMultiply";
multiplier = obs_get_video_sdr_white_level() / 80.0f;
}
libobs/obs-source.c
+1 -2
View File
@@ -2498,8 +2498,7 @@ static inline void obs_source_render_async_video(obs_source_t *source)
}
break;
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB) {
tech_name = "DrawMultiply";
multiplier =
obs_get_video_sdr_white_level() / 80.0f;
libobs/obs.c
+1 -1
View File
@@ -56,7 +56,7 @@ static inline void calc_gpu_conversion_sizes(struct obs_core_video_mix *video)
video->conversion_width_i = 0.f;
video->conversion_height_i = 0.f;
switch ((uint32_t)info->format) {
switch (info->format) {
case VIDEO_FORMAT_I420:
video->conversion_needed = true;
video->conversion_techs[0] = "Planar_Y";
plugins/linux-capture/linux-capture.c
+1 -8
View File
@@ -31,16 +31,9 @@ bool obs_module_load(void)
{
enum obs_nix_platform_type platform = obs_get_nix_platform();
switch (platform) {
case OBS_NIX_PLATFORM_X11_EGL:
if (platform == OBS_NIX_PLATFORM_X11_EGL) {
obs_register_source(&xshm_input);
xcomposite_load();
break;
#ifdef ENABLE_WAYLAND
case OBS_NIX_PLATFORM_WAYLAND:
break;
#endif
}
return true;
plugins/obs-ffmpeg/obs-ffmpeg-formats.h
+1 -1
View File
@@ -98,7 +98,7 @@ determine_chroma_location(enum AVPixelFormat pix_fmt,
static inline enum audio_format
convert_ffmpeg_sample_format(enum AVSampleFormat format)
{
switch ((uint32_t)format) {
switch (format) {
case AV_SAMPLE_FMT_U8:
return AUDIO_FORMAT_U8BIT;
case AV_SAMPLE_FMT_S16:
plugins/obs-filters/crop-filter.c
+1 -2
View File
@@ -194,8 +194,7 @@ get_tech_name_and_multiplier(enum gs_color_space current_space,
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB) {
tech_name = "DrawMultiply";
*multiplier = obs_get_video_sdr_white_level() / 80.0f;
}
plugins/obs-filters/gpu-delay.c
+1 -2
View File
@@ -199,8 +199,7 @@ get_tech_name_and_multiplier(enum gs_color_space current_space,
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB) {
tech_name = "DrawMultiply";
*multiplier = obs_get_video_sdr_white_level() / 80.0f;
}
plugins/obs-filters/nvidia-greenscreen-filter.c
+1 -2
View File
@@ -634,8 +634,7 @@ get_tech_name_and_multiplier(enum gs_color_space current_space,
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB) {
tech_name = "DrawMultiply";
*multiplier = obs_get_video_sdr_white_level() / 80.0f;
}
plugins/obs-filters/scale-filter.c
+4 -17
View File
@@ -281,16 +281,9 @@ get_tech_name_and_multiplier(const struct scale_filter_data *filter,
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
*multiplier = obs_get_video_sdr_white_level() / 80.f;
}
break;
case GS_CS_709_EXTENDED:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB)
*multiplier = obs_get_video_sdr_white_level() / 80.f;
}
break;
case GS_CS_709_SCRGB:
switch (current_space) {
@@ -307,10 +300,8 @@ get_tech_name_and_multiplier(const struct scale_filter_data *filter,
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB)
tech_name = "DrawUndistortMultiply";
}
break;
case GS_CS_709_EXTENDED:
switch (current_space) {
@@ -337,10 +328,8 @@ get_tech_name_and_multiplier(const struct scale_filter_data *filter,
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB)
tech_name = "DrawUpscaleMultiply";
}
break;
case GS_CS_709_EXTENDED:
switch (current_space) {
@@ -366,10 +355,8 @@ get_tech_name_and_multiplier(const struct scale_filter_data *filter,
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB)
tech_name = "DrawMultiply";
}
break;
case GS_CS_709_EXTENDED:
switch (current_space) {
plugins/obs-filters/scroll-filter.c
+1 -2
View File
@@ -195,8 +195,7 @@ get_tech_name_and_multiplier(enum gs_color_space current_space,
switch (source_space) {
case GS_CS_SRGB:
case GS_CS_SRGB_16F:
switch (current_space) {
case GS_CS_709_SCRGB:
if (current_space == GS_CS_709_SCRGB) {
tech_name = "DrawMultiply";
*multiplier = obs_get_video_sdr_white_level() / 80.0f;
}
plugins/obs-qsv11/common_directx9.cpp
+1 -1
View File
@@ -186,7 +186,7 @@ mfxStatus dx9_simple_lock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
if (FAILED(hr))
return MFX_ERR_LOCK_MEMORY;
switch ((DWORD)desc.Format) {
switch (desc.Format) {
case D3DFMT_NV12:
ptr->Pitch = (mfxU16)locked.Pitch;
ptr->Y = (mfxU8 *)locked.pBits;
plugins/win-capture/graphics-hook/d3d8-capture.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ static d3d8_data data = {};
static DXGI_FORMAT d3d8_to_dxgi_format(D3DFORMAT format)
{
switch ((unsigned long)format) {
switch (format) {
case D3DFMT_X1R5G5B5:
case D3DFMT_A1R5G5B5:
return DXGI_FORMAT_B5G5R5A1_UNORM;
plugins/win-capture/graphics-hook/d3d9-capture.cpp
+1 -1
View File
@@ -94,7 +94,7 @@ static void d3d9_free()
static DXGI_FORMAT d3d9_to_dxgi_format(D3DFORMAT format)
{
switch ((unsigned long)format) {
switch (format) {
case D3DFMT_A2B10G10R10:
return DXGI_FORMAT_R10G10B10A2_UNORM;
case D3DFMT_A8R8G8B8:
plugins/win-capture/graphics-hook/dxgi-helpers.hpp
+2 -2
View File
@@ -4,7 +4,7 @@
static inline DXGI_FORMAT strip_dxgi_format_srgb(DXGI_FORMAT format)
{
switch ((unsigned long)format) {
switch (format) {
case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
return DXGI_FORMAT_B8G8R8A8_UNORM;
case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
@@ -18,7 +18,7 @@ static inline DXGI_FORMAT apply_dxgi_format_typeless(DXGI_FORMAT format,
bool allow_srgb_alias)
{
if (allow_srgb_alias) {
switch ((unsigned long)format) {
switch (format) {
case DXGI_FORMAT_B8G8R8A8_UNORM:
return DXGI_FORMAT_B8G8R8A8_TYPELESS;
case DXGI_FORMAT_R8G8B8A8_UNORM: