Commit 73a54bf0 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #6852: audiolayer creation depends only on preference.audioApi

parent c1b8adde
......@@ -43,6 +43,7 @@
#include <widget/gtkscrollbook.h>
#include <widget/minidialog.h>
#include "uimanager.h"
#include "config/audioconf.h"
#include <sys/stat.h>
#include <gtk/gtk.h>
......
......@@ -135,6 +135,9 @@
/** Error codecs not loaded */
#define CODECS_NOT_LOADED 0x1000
#define PULSEAUDIO_API_STR "pulseaudio"
#define ALSA_API_STR "alsa"
/** Tone to play when no voice mails */
#define TONE_WITHOUT_MESSAGE 0
/** Tone to play when voice mails */
......@@ -143,14 +146,8 @@
#define MINIMIZED TRUE
/** Behaviour of the main window on incoming calls */
#define __POPUP_WINDOW (eel_gconf_get_integer (POPUP_ON_CALL))
/** Show/Hide the alsa configuration panel */
#define SHOW_ALSA_CONF ( dbus_get_audio_manager() == ALSA )
/** Show/Hide the volume controls */
#define SHOW_VOLUME (eel_gconf_get_integer (SHOW_VOLUME_CONTROLS) && SHOW_ALSA_CONF)
/** Audio Managers */
#define ALSA 0
#define PULSEAUDIO 1
#define SHOW_VOLUME (eel_gconf_get_integer (SHOW_VOLUME_CONTROLS) && must_show_alsa_conf())
/** DTMF type */
#define OVERRTP "overrtp"
......
......@@ -44,6 +44,7 @@
#include <eel-gconf-extensions.h>
#include "config/audioconf.h"
#include "uimanager.h"
#include "statusicon.h"
......@@ -1767,7 +1768,7 @@ create_menus (GtkUIManager *ui_manager)
// Set the toggle buttons
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (ui_manager, "/MenuBar/ViewMenu/Dialpad")), eel_gconf_get_boolean (CONF_SHOW_DIALPAD));
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (volumeToggle), (gboolean) SHOW_VOLUME);
gtk_action_set_sensitive (GTK_ACTION (volumeToggle), SHOW_ALSA_CONF);
gtk_action_set_sensitive (GTK_ACTION (volumeToggle), must_show_alsa_conf());
gtk_action_set_sensitive (GTK_ACTION (gtk_ui_manager_get_action (ui_manager, "/MenuBar/ViewMenu/Toolbar")), FALSE);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment