summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2011-11-09 21:15:49 +0100
committerLars-Dominik Braun <lars@6xq.net>2011-11-09 21:15:49 +0100
commit4d44f11288132a225258a6d2d94e984624aae557 (patch)
tree0b2a0b1e9de218f94756b791596511536cd708cd /src/main.c
parent937fdfb4ed8e55795902e8567e8624da06ea4f8a (diff)
downloadpianobar-windows-4d44f11288132a225258a6d2d94e984624aae557.tar.gz
pianobar-windows-4d44f11288132a225258a6d2d94e984624aae557.tar.bz2
pianobar-windows-4d44f11288132a225258a6d2d94e984624aae557.zip
TLS is not optional any more
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/main.c b/src/main.c
index 668bdbf..d4bf6fb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -338,23 +338,15 @@ int main (int argc, char **argv) {
/* init some things */
ao_initialize ();
-#ifdef ENABLE_TLS
gnutls_global_init ();
-#endif
PianoInit (&app.ph);
BarSettingsInit (&app.settings);
BarSettingsRead (&app.settings);
-#ifdef ENABLE_TLS
WaitressInit (&app.waith, app.settings.tlsCaPath);
-#else
- WaitressInit (&app.waith, NULL);
-#endif
app.waith.url.host = strdup (PIANO_RPC_HOST);
-#ifdef ENABLE_TLS
- app.waith.url.tls = app.settings.tls;
-#endif
+ app.waith.url.tls = true;
BarUiMsg (&app.settings, MSG_NONE,
"Welcome to " PACKAGE " (" VERSION ")! ");
@@ -394,9 +386,7 @@ int main (int argc, char **argv) {
PianoDestroyPlaylist (app.playlist);
WaitressFree (&app.waith);
ao_shutdown();
-#ifdef ENABLE_TLS
gnutls_global_deinit ();
-#endif
BarSettingsDestroy (&app.settings);
/* restore terminal attributes, zsh doesn't need this, bash does... */