diff --git a/azbox/video.cpp b/azbox/video.cpp index bf08c65..8ce3817 100644 --- a/azbox/video.cpp +++ b/azbox/video.cpp @@ -158,7 +158,9 @@ int cVideo::setAspectRatio(int aspect, int mode) /* { "panscan", "letterbox", "fullscreen", "14:9", "(unset)" } */ static const char *m[] = { "1", "2", "0", "1", "(unset)" }; int n; - lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[(mode < 0||mode > 3) ? 4 : mode]); + + int mo = (mode < 0||mode > 3) ? 4 : mode; + lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[(mo]); if (aspect > 3 || aspect == 0) lt_info("%s: invalid aspect: %d\n", __func__, aspect); @@ -173,8 +175,8 @@ int cVideo::setAspectRatio(int aspect, int mode) if (mode == -1) return 0; - lt_debug("%s: /proc/scalingmode -> %s\n", __func__, m[mode]); - n = proc_put("/proc/scalingmode", m[mode], strlen(m[mode])); + lt_debug("%s: /proc/scalingmode -> %s\n", __func__, m[mo]); + n = proc_put("/proc/scalingmode", m[mo], strlen(m[mo])); if (n < 0) return 1; return 0; diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index b3e5f96..3b1f244 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -365,7 +365,9 @@ int cVideo::setAspectRatio(int aspect, int mode) // static const char *m[] = { "panscan", "letterbox", "bestfit", "nonlinear", "(unset)" }; static const char *m[] = { "letterbox", "panscan", "bestfit", "nonlinear", "(unset)" }; int n; - lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[(mode < 0||mode > 3) ? 4 : mode]); + + int mo = (mode < 0||mode > 3) ? 4 : mode; + lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[mo]); if (aspect > 3 || aspect == 0) lt_info("%s: invalid aspect: %d\n", __func__, aspect); @@ -380,8 +382,8 @@ int cVideo::setAspectRatio(int aspect, int mode) if (mode == -1) return 0; - lt_debug("%s: /proc/stb/video/policy -> %s\n", __func__, m[mode]); - n = proc_put("/proc/stb/video/policy", m[mode], strlen(m[mode])); + lt_debug("%s: /proc/stb/video/policy -> %s\n", __func__, m[mo]); + n = proc_put("/proc/stb/video/policy", m[mo], strlen(m[mo])); if (n < 0) return 1; return 0; diff --git a/libspark/video.cpp b/libspark/video.cpp index 3e331d9..a190ac8 100644 --- a/libspark/video.cpp +++ b/libspark/video.cpp @@ -361,7 +361,9 @@ int cVideo::setAspectRatio(int aspect, int mode) static const char *a[] = { "n/a", "4:3", "14:9", "16:9" }; static const char *m[] = { "panscan", "letterbox", "bestfit", "nonlinear", "(unset)" }; int n; - lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[(mode < 0||mode > 3) ? 4 : mode]); + + int mo = (mode < 0||mode > 3) ? 4 : mode; + lt_debug("%s: a:%d m:%d %s\n", __func__, aspect, mode, m[mo]); if (aspect > 3 || aspect == 0) lt_info("%s: invalid aspect: %d\n", __func__, aspect); @@ -376,8 +378,8 @@ int cVideo::setAspectRatio(int aspect, int mode) if (mode == -1) return 0; - lt_debug("%s: /proc/stb/video/policy -> %s\n", __func__, m[mode]); - n = proc_put("/proc/stb/video/policy", m[mode], strlen(m[mode])); + lt_debug("%s: /proc/stb/video/policy -> %s\n", __func__, m[mo]); + n = proc_put("/proc/stb/video/policy", m[mo], strlen(m[mo])); if (n < 0) return 1; return 0;