summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorMichał Cichoń <michcic@gmail.com>2015-12-05 16:05:51 +0100
committerMichał Cichoń <michcic@gmail.com>2015-12-05 16:05:51 +0100
commitb0176f24ac3e68ef314a9a4ab87f6b2248777614 (patch)
tree99d27abdbc7d46e4af5bf563173c9edac6a0e1d7 /src/main.c
parentb7a10d561acfa4cc7f8ae15722a7de28ee961d03 (diff)
downloadpianobar-windows-b0176f24ac3e68ef314a9a4ab87f6b2248777614.tar.gz
pianobar-windows-b0176f24ac3e68ef314a9a4ab87f6b2248777614.tar.bz2
pianobar-windows-b0176f24ac3e68ef314a9a4ab87f6b2248777614.zip
Add 'player' configuration option to select player back end. Current valid values:
- 'ds' - for Direct Show - 'mf' - for Windows Media Foundation (default) If not present, backends will be initialized in order: mf, ds
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 900e56e..99793f3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -337,11 +337,18 @@ int main (int argc, char **argv) {
BarConsoleSetTitle (TITLE);
/* init some things */
- BarPlayer2Init (&app.player);
-
BarSettingsInit (&app.settings);
BarSettingsRead (&app.settings);
+ if (!BarPlayer2Init (&app.player, app.settings.player))
+ {
+ if (app.settings.player)
+ BarUiMsg(&app.settings, MSG_ERR, "Player \"%s\" initialization failed.", app.settings.player);
+ else
+ BarUiMsg(&app.settings, MSG_ERR, "Player initialization failed.");
+ return 0;
+ }
+
PianoReturn_t pret;
if ((pret = PianoInit (&app.ph, app.settings.partnerUser,
app.settings.partnerPassword, app.settings.device,