Greatly improved detection of media player name

This commit is contained in:
Linus Dierheimer
2022-03-22 18:59:04 +01:00
parent ad006b466c
commit 0916258c87
6 changed files with 155 additions and 54 deletions
+5 -3
View File
@@ -1,7 +1,7 @@
#include "fastfetch.h"
#define FF_PLAYER_MODULE_NAME "Media Player"
#define FF_PLAYER_NUM_FORMAT_ARGS 1
#define FF_PLAYER_NUM_FORMAT_ARGS 3
void ffPrintPlayer(FFinstance* instance)
{
@@ -16,12 +16,14 @@ void ffPrintPlayer(FFinstance* instance)
if(instance->config.playerFormat.length == 0)
{
ffPrintLogoAndKey(instance, FF_PLAYER_MODULE_NAME, 0, &instance->config.playerKey);
ffStrbufPutTo(&media->player, stdout);
ffStrbufPutTo(&media->playerPretty, stdout);
}
else
{
ffPrintFormatString(instance, FF_PLAYER_MODULE_NAME, 0, &instance->config.playerKey, &instance->config.playerFormat, NULL, FF_PLAYER_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &media->player}
{FF_FORMAT_ARG_TYPE_STRBUF, &media->playerPretty},
{FF_FORMAT_ARG_TYPE_STRBUF, &media->player},
{FF_FORMAT_ARG_TYPE_STRBUF, &media->busNameShort}
});
}
}
+3 -2
View File
@@ -1,7 +1,7 @@
#include "fastfetch.h"
#define FF_SONG_MODULE_NAME "Song"
#define FF_SONG_NUM_FORMAT_ARGS 3
#define FF_SONG_NUM_FORMAT_ARGS 4
void ffPrintSong(FFinstance* instance)
{
@@ -36,7 +36,8 @@ void ffPrintSong(FFinstance* instance)
ffPrintFormatString(instance, FF_SONG_MODULE_NAME, 0, &instance->config.songKey, &instance->config.songFormat, NULL, FF_SONG_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &media->song},
{FF_FORMAT_ARG_TYPE_STRBUF, &media->artist},
{FF_FORMAT_ARG_TYPE_STRBUF, &media->album}
{FF_FORMAT_ARG_TYPE_STRBUF, &media->album},
{FF_FORMAT_ARG_TYPE_STRBUF, &media->url}
});
}
}