From cf5c68b773c9af1304801495ee525e8f4c9e6bd5 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Fri, 5 Aug 2022 14:25:57 +0200 Subject: [PATCH] UI,libobs,libobs-opengl,obs-ffmpeg: Remove unneeded cast in switches Those casts were usually used to workaround switch warnings. Also adds default to OBS frontend event switches that had this workaround. --- UI/source-tree.cpp | 4 +++- UI/window-basic-stats.cpp | 4 +++- libobs-opengl/gl-shader.c | 2 +- libobs/graphics/graphics-ffmpeg.c | 2 +- libobs/obs.c | 2 +- plugins/obs-ffmpeg/obs-ffmpeg-formats.h | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/UI/source-tree.cpp b/UI/source-tree.cpp index 3d9f03a33..0aa6302c0 100644 --- a/UI/source-tree.cpp +++ b/UI/source-tree.cpp @@ -636,7 +636,7 @@ void SourceTreeModel::OBSFrontendEvent(enum obs_frontend_event event, void *ptr) { SourceTreeModel *stm = reinterpret_cast(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; } } diff --git a/UI/window-basic-stats.cpp b/UI/window-basic-stats.cpp index dd05bdf38..732dba2d0 100644 --- a/UI/window-basic-stats.cpp +++ b/UI/window-basic-stats.cpp @@ -22,13 +22,15 @@ void OBSBasicStats::OBSFrontendEvent(enum obs_frontend_event event, void *ptr) { OBSBasicStats *stats = reinterpret_cast(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; } } diff --git a/libobs-opengl/gl-shader.c b/libobs-opengl/gl-shader.c index 6d7a2a18d..0c3c9c115 100644 --- a/libobs-opengl/gl-shader.c +++ b/libobs-opengl/gl-shader.c @@ -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; diff --git a/libobs/graphics/graphics-ffmpeg.c b/libobs/graphics/graphics-ffmpeg.c index 495378f5c..a94d41eb3 100644 --- a/libobs/graphics/graphics-ffmpeg.c +++ b/libobs/graphics/graphics-ffmpeg.c @@ -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: diff --git a/libobs/obs.c b/libobs/obs.c index 291e25682..fae0a5176 100644 --- a/libobs/obs.c +++ b/libobs/obs.c @@ -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"; diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-formats.h b/plugins/obs-ffmpeg/obs-ffmpeg-formats.h index d2a9b112d..963ed3db8 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-formats.h +++ b/plugins/obs-ffmpeg/obs-ffmpeg-formats.h @@ -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: