Revert "Brightness (Linux): allow specifying busno for ddcutil"

This doesn't seem to improve much performance, but increase code
complexity a lot

This reverts commit 42e87b498c.
This commit is contained in:
李通洲
2023-10-14 09:35:40 +08:00
parent 42e87b498c
commit af94596202
3 changed files with 26 additions and 97 deletions
-24
View File
@@ -88,10 +88,6 @@ void ffInitBrightnessOptions(FFBrightnessOptions* options)
{
ffOptionInitModuleBaseInfo(&options->moduleInfo, FF_BRIGHTNESS_MODULE_NAME, ffParseBrightnessCommandOptions, ffParseBrightnessJsonObject, ffPrintBrightness, ffGenerateBrightnessJson, ffPrintBrightnessHelpFormat);
ffOptionInitModuleArg(&options->moduleArgs);
#ifdef __linux__
ffListInit(&options->busNos, sizeof(int));
#endif
}
bool ffParseBrightnessCommandOptions(FFBrightnessOptions* options, const char* key, const char* value)
@@ -107,10 +103,6 @@ bool ffParseBrightnessCommandOptions(FFBrightnessOptions* options, const char* k
void ffDestroyBrightnessOptions(FFBrightnessOptions* options)
{
ffOptionDestroyModuleArg(&options->moduleArgs);
#ifdef __linux__
ffListDestroy(&options->busNos);
#endif
}
void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* module)
@@ -126,22 +118,6 @@ void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* modul
if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
continue;
#ifdef __linux__
if(ffStrEqualsIgnCase(key, "busNos"))
{
if (!yyjson_is_arr(val)) continue;
yyjson_val* item;
size_t idx, max;
yyjson_arr_foreach(val, idx, max, item)
{
if (!yyjson_is_int(item)) continue;
*(int*) ffListAdd(&options->busNos) = yyjson_get_int(item);
}
continue;
}
#endif
ffPrintError(FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
}
}
-4
View File
@@ -8,8 +8,4 @@ typedef struct FFBrightnessOptions
{
FFModuleBaseInfo moduleInfo;
FFModuleArgs moduleArgs;
#ifdef __linux__
FFlist busNos;
#endif
} FFBrightnessOptions;