Skip to content

GitLab

Commit 79f69cc7 authored by yanmorin's avatar yanmorin
Browse files
Options

Compile on debian 

Modify Fedora Core spec to support fedora core 6 (libsamplerate, libeXosip2)
parent 59037aef
Hide whitespace changes
Inline Side-by-side
Showing with 261 additions and 142 deletions
ChangeLog
View file @ 79f69cc7
2006-11-30 Yan Morin
* Fix .spec problem on fedora core 6
* Fix "selecting #0" device in sflphoned
* Fix using #8 when there is only 2 out devices)
2006-09-09 Yan Morin
* Fixing gentoo problem (qtdir for moc/uic/qembed, Key_Mode_switch)
......
README
View file @ 79f69cc7
......@@ -59,7 +59,10 @@ Required libraries and tools:
http://portaudio.com/archives/pa_snapshot_v19.tar.gz
or
svn co https://www.portaudio.com/repos/portaudio/branches/v19-devel portaudio
or
cd tools/ ./portaudio.sh
- autoconf
Optional libraries:
- zeroconf: (tested with mDNSResponder87)
http://developer.apple.com/darwin/projects/bonjour/
......@@ -74,6 +77,8 @@ Some of the required libraries may be downloaded from
See tools/config.sh for details
So in debian, you need:
apt-get install autoconf automake1.9 libtool libosip2-dev libexosip2-dev libccrtp-dev libcommoncpp2-dev pkg-config libqt3-mt-dev libsamplerate-dev libasound2-dev
Building the dependencies
......
configure.ac
View file @ 79f69cc7
......@@ -23,7 +23,7 @@ AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_MACRO_DIR([m4])
dnl What to generate
AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
dnl AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([libs/Makefile \
libs/taxidermy/Makefile \
......@@ -46,7 +46,7 @@ AC_CONFIG_FILES([skins/Makefile \
skins/gmetal/Makefile \
ringtones/Makefile])
AC_CONFIG_FILES([platform/debian/changelog platform/rpm/sflphone.spec \
platform/fedora/sflphone.spec])
platform/fedora/sflphone.spec platform/fedora/sflphone-fc6.spec])
dnl the file stamp-h.in should be there before (instead of AC_CONFIG_HEADERS(config.h))
AM_CONFIG_HEADER(config.h)
......@@ -80,6 +80,7 @@ AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
dnl will have to remove this
AC_PROG_LIBTOOL
dnl Define C++ as default language
......
libs/taxidermy/Makefile.am
View file @ 79f69cc7
......@@ -43,13 +43,10 @@ libtaxidermy_la_SOURCES = \
CLEANFILES = \
$(BUILT_SOURCES)
AM_CPPFLAGS = -I$(top_srcdir)/libs/ $(QT_CXXFLAGS) $(X_INCLUDES)
AM_LDFLAGS = $(QT_LDADD) $(X_LDFLAGS)
#AM_LDFLAGS = $(QT_LDADD) $(X_LDFLAGS)
libtaxidermy_la_LIBADD = $(QT_LDADD)
%.h: %.ui
$(UIC) -o $@ $<
......
m4/gwqt.m4
View file @ 79f69cc7
......@@ -254,5 +254,5 @@ AC_SUBST(QT_CXXFLAGS)
AC_SUBST(QT_LDADD)
AC_SUBST(QT_GUILINK)
AC_SUBST(QASSISTANTCLIENT_LDADD)
AC_SUBST(QT_LIBS)
])
platform/fedora/sflphone-fc6.spec.in 0 → 100644
View file @ 79f69cc7
%define name sflphone
%define version @RPM_VERSION@
Autoreq: 0
Name: %name
Summary: A VoIP daemon with SIP protocol
Version: %version
Release: 1
License: GPL
Group: System Environment/Daemons
URL: http://www.sflphone.org/
Packager: Cyrille Béraud <cyrille.beraud@savoirfairelinux.com>
Source0: http://www.sflphone.org/releases/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: commoncpp2 ccrtp libosip2 libeXosip2 libsamplerate qt
%description
SFLPhoned is a VoIP daeamon with SIP protocol.
%prep
%setup -q
%build
%configure --prefix=%{_prefix}
make
%install
rm -fr %{buildroot}
%makeinstall
%clean
rm -rf %{buildroot}
%files
%defattr(-, root, root)
%{_bindir}/sflphone
%{_libexecdir}/sflphoned
%{_libexecdir}/sflphone-qt
%{_libexecdir}/sflphone-cli
%{_datadir}/sflphone/ringtones/*
%{_datadir}/sflphone/skins/*
%changelog
* Thu Nov 30 2006 Yan Morin <yan.morin@savoirfairelinux.com>
Packaging sflphone for Fedora Core 6
* Wed Sep 6 2006 Yan Morin <yan.morin@savoirfairelinux.com>
Packaging sflphone, sflphone-qt and sflphone-cli
* Mon Nov 21 2005 Yan Morin <yan.morin@savoirfairelinux.com>
- Final 0.6.0 version (Release / Source without alphatag)
src/Makefile.am
View file @ 79f69cc7
......@@ -37,7 +37,7 @@ sflphoned_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone
#sflphoned_LDFLAGS = -static
sflphoned_LDADD = ./libsflphone.la $(SFLPHONE_LIBS) $(ZEROCONFLIB) $(LIB_DNSSD) $(IAX_LIBS) $(EXOSIP_LIBS)
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs $(libccext2_CFLAGS) $(libccgnu2_CFLAGS) $(IAX_CFLAGS) $(USER_INCLUDES) $(SAMPLERATE_FLAG)
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs $(libccext2_CFLAGS) $(libccgnu2_CFLAGS) $(IAX_CFLAGS) $(USER_INCLUDES)
#libsflphone_la_LDFLAGS= -version-info 0:1:0
libsflphone_la_LIBADD = \
......@@ -46,7 +46,7 @@ libsflphone_la_LIBADD = \
./audio/libaudio.la \
./gui/libguiframework.la \
./config/libconfig.la \
$(IAX_LIBS) $(SAMPLERATE_LIB)
$(IAX_LIBS)
libsflphone_la_SOURCES =
......
src/audio/Makefile.am
View file @ 79f69cc7
......@@ -3,11 +3,11 @@ SUBDIRS = gsm
noinst_LTLIBRARIES = libaudio.la
if USE_SPEEX
SPEEX_SOURCES=CodecSpeex.cpp
SPEEX_SOURCES_CPP=CodecSpeex.cpp
SPEEX_FLAG=-DHAVE_SPEEX
SPEEX_LIB=-lspeex
else
SPEEX_SOURCES=
SPEEX_SOURCES_CPP=
SPEEX_FLAG=
SPEEX_LIB=
endif
......@@ -15,11 +15,11 @@ endif
libaudio_la_SOURCES = alaw.cpp audiofile.cpp g711.cpp tonelist.cpp \
audiortp.cpp dtmf.cpp tone.cpp audiocodec.cpp audiolayer.cpp audiodevice.cpp dtmfgenerator.cpp gsmcodec.cpp \
tonegenerator.cpp ulaw.cpp codecDescriptor.cpp \
audioloop.cpp ringbuffer.cpp $(SPEEX_SOURCES)
audioloop.cpp ringbuffer.cpp $(SPEEX_SOURCES_CPP)
AM_CXXFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libs $(libccext2_CFLAGS) $(libccrtp1_CFLAGS) $(USER_INCLUDES)
libaudio_la_LIBADD = gsm/libgsm.la $(SPEEX_LIB) $(SAMPLERATE_LIB)
libaudio_la_CPPFLAGS = $(SPEEX_FLAG) $(SAMPLERATE_FLAG)
libaudio_la_LIBADD = gsm/libgsm.la $(SPEEX_LIB)
libaudio_la_CPPFLAGS = $(SPEEX_FLAG)
noinst_HEADERS = audioloop.h common.h ringbuffer.h alaw.h audiofile.h g711.h \
......
src/audio/audiolayer.cpp
View file @ 79f69cc7
......@@ -120,14 +120,15 @@ AudioLayer::openDevice (int indexIn, int indexOut, int sampleRate)
_debug("Portaudio detect no sound card.");
return;
} else {
if (indexIn >= nbDevice) {
_debug(" Portaudio auto-select device #0 for input because device #%02d is not found\n", indexIn);
indexIn = 0;
}
if (indexOut >= nbDevice) {
_debug(" Portaudio auto-select device #0 for output because device #%02d is not found\n", indexOut);
indexOut = 0;
}
// not good,
// if (indexIn >= nbDevice) {
// _debug(" Portaudio auto-select device #0 for input because device #%02d is not found\n", indexIn);
// indexIn = 0;
// }
// if (indexOut >= nbDevice) {
// _debug(" Portaudio auto-select device #0 for output because device #%02d is not found\n", indexOut);
// indexOut = 0;
// }
_debug(" Setting audiolayer: device in=%2d, out=%2d\n", indexIn, indexOut);
_debug(" : nb channel in=%2d, out=%2d\n", _inChannel, _outChannel);
......
src/gui/cli/Makefile.am
View file @ 79f69cc7
libexec_PROGRAMS = sflphone-cli
#-lncurses
AM_LDFLAGS = $(LIBREADLINE)
sflphone_cli_LDADD = $(LIBREADLINE)
#AM_LDFLAGS = $(LIBREADLINE)
sflphone_cli_SOURCES = \
calls.c calls.h \
commons.h \
......
src/gui/qt/ConfigurationPanel.ui
View file @ 79f69cc7
......@@ -1584,6 +1584,8 @@ Montreal, Quebec H2T 1S6, Canada&lt;/p&gt;</string>
<variables>
<variable access="private">int lastSIPAccount;</variable>
<variable access="private">int _cutStringCombo;</variable>
<variable access="private">std::map &lt; int, int &gt; _deviceInMap</variable>
<variable access="private">std::map &lt; int, int &gt; _deviceOutMap</variable>
</variables>
......
src/gui/qt/ConfigurationPanel.ui.h
View file @ 79f69cc7
......@@ -43,6 +43,8 @@
#include "SkinManager.hpp"
#include "TransparentWidget.hpp"
#include <map>
#define SIGNALISATIONS_IMAGE "signalisations.png"
#define AUDIO_IMAGE "audio.png"
#define PREFERENCES_IMAGE "preferences.png"
......@@ -152,8 +154,35 @@ ConfigurationPanel::generate()
pulseLength->setValue(ConfigurationManager::instance().get(SIGNALISATION_SECTION,
SIGNALISATION_PULSE_LENGTH).toUInt());
cboDriverChoiceOut->setCurrentItem(ConfigurationManager::instance().get(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEOUT).toUInt());
cboDriverChoiceIn->setCurrentItem(ConfigurationManager::instance().get(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEIN).toUInt());
// select the position index (combobox of the device index)
// deviceIndexOut can be 8, but be at position 0 in the combo box
int deviceIndexOut = ConfigurationManager::instance().get(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEOUT).toInt();
int deviceIndexIn = ConfigurationManager::instance().get(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEIN).toInt();
int positionIndexIn = 0;
int positionIndexOut = 0;
// search for deviceIndexIn, and get the positionIndex (key)
std::map< int, int >::iterator it = _deviceInMap.begin();
while (it != _deviceInMap.end()) {
if ( it->second == deviceIndexIn) {
// we found the deviceIndex
positionIndexIn = it->first;
break;
}
it++;
}
it = _deviceOutMap.begin();
while (it != _deviceOutMap.end()) {
if ( it->second == deviceIndexOut) {
// we found the deviceIndex
positionIndexOut = it->first;
break;
}
it++;
}
cboDriverChoiceIn->setCurrentItem(positionIndexIn);
cboDriverChoiceOut->setCurrentItem(positionIndexOut);
// fill cboDriverRate here
int nbRate = 5;
......@@ -195,11 +224,17 @@ void ConfigurationPanel::saveSlot()
if (ringsChoice->currentText() != NULL) {
ConfigurationManager::instance().set(AUDIO_SECTION, AUDIO_RINGTONE, ringsChoice->currentText());
}
int cboPosition = 0;
int deviceIndex = 0;
if (cboDriverChoiceOut->currentText() != NULL) {
ConfigurationManager::instance().set(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEOUT, QString::number(cboDriverChoiceOut->currentItem()));
cboPosition = cboDriverChoiceOut->currentItem();
deviceIndex = _deviceOutMap[cboPosition]; // return 0 if not found and create it, by STL
ConfigurationManager::instance().set(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEOUT, QString::number(deviceIndex));
}
if (cboDriverChoiceIn->currentText() != NULL) {
ConfigurationManager::instance().set(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEIN, QString::number(cboDriverChoiceIn->currentItem()));
cboPosition = cboDriverChoiceIn->currentItem();
deviceIndex = _deviceInMap[cboPosition]; // return 0 if not found and create it, by STL
ConfigurationManager::instance().set(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEIN, QString::number(deviceIndex));
}
SkinManager::instance().load(SkinChoice->currentText());
......@@ -307,7 +342,9 @@ void ConfigurationPanel::updateAudioDevicesIn()
std::list< AudioDevice > audio = ConfigurationManager::instance().getAudioDevicesIn();
std::list< AudioDevice >::iterator pos;
cbo->clear();
_deviceInMap.clear();
int iPos = 0;
for (pos = audio.begin(); pos != audio.end(); pos++) {
QString hostApiName = pos->hostApiName;
QString deviceName = pos->deviceName;
......@@ -317,6 +354,8 @@ void ConfigurationPanel::updateAudioDevicesIn()
}
QString name = hostApiName + QObject::tr(" (device #%1-%2Hz)").arg(pos->index).arg(pos->defaultRate);
cbo->insertItem(name);
_deviceInMap[iPos] = pos->index.toInt();
iPos++;
}
}
......@@ -331,7 +370,9 @@ void ConfigurationPanel::updateAudioDevices()
std::list< AudioDevice > audio = ConfigurationManager::instance().getAudioDevicesOut();
std::list< AudioDevice >::iterator pos;
cbo->clear();
_deviceOutMap.clear();
int iPos = 0;
for (pos = audio.begin(); pos != audio.end(); pos++) {
QString hostApiName = pos->hostApiName;
QString deviceName = pos->deviceName;
......@@ -342,6 +383,8 @@ void ConfigurationPanel::updateAudioDevices()
//DebugOutput::instance() << hostApiName << pos->defaultRate;
QString name = hostApiName + QObject::tr(" (device #%1-%2Hz)").arg(pos->index).arg(pos->defaultRate);
cbo->insertItem(name);
_deviceOutMap[iPos] = pos->index.toInt();
iPos++;
}
}
......@@ -379,11 +422,17 @@ void
ConfigurationPanel::slotTestSoundDriver()
{
// save driver in configuration manager
int cboPosition = 0;
int deviceIndex = 0;
if (cboDriverChoiceOut->currentText() != NULL) {
ConfigurationManager::instance().set(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEOUT, QString::number(cboDriverChoiceOut->currentItem()));
cboPosition = cboDriverChoiceOut->currentItem();
deviceIndex = _deviceOutMap[cboPosition]; // return 0 if not found and create it, by STL
ConfigurationManager::instance().set(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEOUT, QString::number(deviceIndex));
}
if (cboDriverChoiceIn->currentText() != NULL) {
ConfigurationManager::instance().set(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEIN, QString::number(cboDriverChoiceIn->currentItem()));
cboPosition = cboDriverChoiceIn->currentItem();
deviceIndex = _deviceInMap[cboPosition]; // return 0 if not found and create it, by STL
ConfigurationManager::instance().set(AUDIO_SECTION, AUDIO_DEFAULT_DEVICEIN, QString::number(deviceIndex));
}
if (cboDriverRate->currentText() != NULL) {
ConfigurationManager::instance().set(AUDIO_SECTION, AUDIO_SAMPLERATE, cboDriverRate->currentText());
......
src/gui/qt/Makefile.am
View file @ 79f69cc7
libexec_PROGRAMS = sflphone-qt
BUILT_SOURCES = \
./ConfigurationPanelui.cpp \
./ConfigurationPanel.h \
./ConfigurationPanelmocpp.cpp \
./ConfigurationManagerImplmoc.cpp \
./ConfigurationPanelImplmoc.cpp \
./JPushButtonmoc.cpp \
./Launchermoc.cpp \
./NumericKeypadmoc.cpp \
./PhoneLinemoc.cpp \
./PhoneLineButtonmoc.cpp \
./PhoneLineManagerImplmoc.cpp \
./SFLLcdmoc.cpp \
./SFLPhoneAppmoc.cpp \
./SFLPhoneWindowmoc.cpp \
./SFLRequestmoc.cpp \
./Requestmoc.cpp \
./Sessionmoc.cpp \
./SessionIOmoc.cpp \
./TCPSessionIOmoc.cpp \
./TransparentWidgetmoc.cpp \
./VolumeControlmoc.cpp \
./qmake_image_collection.cpp
ConfigurationPanelui.cpp \
ConfigurationPanel.h \
ConfigurationPanelmocpp.cpp \
ConfigurationManagerImplmoc.cpp \
ConfigurationPanelImplmoc.cpp \
JPushButtonmoc.cpp \
Launchermoc.cpp \
NumericKeypadmoc.cpp \
PhoneLinemoc.cpp \
PhoneLineButtonmoc.cpp \
PhoneLineManagerImplmoc.cpp \
SFLLcdmoc.cpp \
SFLPhoneAppmoc.cpp \
SFLPhoneWindowmoc.cpp \
SFLRequestmoc.cpp \
Requestmoc.cpp \
Sessionmoc.cpp \
SessionIOmoc.cpp \
TCPSessionIOmoc.cpp \
TransparentWidgetmoc.cpp \
VolumeControlmoc.cpp \
qmake_image_collection.cpp
IMAGES = $(top_srcdir)/images/*.png
sflphone_qt_SOURCES = \
$(BUILT_SOURCES) \
./Account.cpp \
./Account.hpp \
./Call.cpp \
./Call.hpp \
./CallManager.hpp \
./CallManagerImpl.cpp \
./CallManagerImpl.hpp \
./CallStatus.cpp \
./CallStatus.hpp \
./EventAccount.cpp \
./EventAccount.hpp \
./CallStatusFactory.hpp \
./ConfigurationManager.hpp \
./ConfigurationManagerImpl.cpp \
./ConfigurationManagerImpl.hpp \
./ConfigurationPanelImpl.cpp \
./ConfigurationPanelImpl.hpp \
./DebugOutput.hpp \
./DebugOutputImpl.cpp \
./DebugOutputImpl.hpp \
./Event.cpp \
./Event.hpp \
./EventFactory.hpp \
./EventFactory.inl \
./Factory.hpp \
./Factory.inl \
./JPushButton.cpp JPushButton.hpp \
./Launcher.cpp \
./Launcher.hpp \
./NumericKeypad.cpp \
./NumericKeypad.hpp \
./ObjectFactory.hpp \
./ObjectFactory.inl \
./ObjectPool.hpp \
./ObjectPool.inl \
./PhoneLine.cpp \
./PhoneLine.hpp \
./PhoneLineButton.cpp \
./PhoneLineButton.hpp \
./PhoneLineLocker.cpp \
./PhoneLineLocker.hpp \
./PhoneLineManager.hpp \
./PhoneLineManagerImpl.cpp \
./PhoneLineManagerImpl.hpp \
./QjListBoxPixmap.cpp \
./QjListBoxPixmap.hpp \
./Request.cpp \
./Request.hpp \
./Requester.hpp \
./RequesterImpl.cpp \
./RequesterImpl.hpp \
./RequesterImpl.inl \
./SFLCallStatus.hpp \
./SFLEvents.cpp \
./SFLEvents.hpp \
./SFLLcd.cpp \
./SFLLcd.hpp \
./SFLPhoneApp.cpp \
./SFLPhoneApp.hpp \
./SFLPhoneWindow.cpp \
./SFLPhoneWindow.hpp \
./SFLRequest.cpp \
./SFLRequest.hpp \
./Session.cpp \
./Session.hpp \
./SessionFactory.hpp \
./SessionIO.hpp \
./SessionIOFactory.hpp \
./SkinManager.hpp \
./SkinManagerImpl.cpp \
./SkinManagerImpl.hpp \
./TCPSessionIO.cpp \
./TCPSessionIO.hpp \
./TCPSessionIOCreator.cpp \
./TCPSessionIOCreator.hpp \
./TransparentWidget.cpp \
./TransparentWidget.hpp \
./Url.cpp \
./Url.hpp \
./VolumeControl.cpp \
./VolumeControl.hpp \
./globals.h \
./main.cpp \
./ConfigurationPanel.ui.h
Account.cpp \
Account.hpp \
Call.cpp \
Call.hpp \
CallManager.hpp \
CallManagerImpl.cpp \
CallManagerImpl.hpp \
CallStatus.cpp \
CallStatus.hpp \
EventAccount.cpp \
EventAccount.hpp \
CallStatusFactory.hpp \
ConfigurationManager.hpp \
ConfigurationManagerImpl.cpp \
ConfigurationManagerImpl.hpp \
ConfigurationPanelImpl.cpp \
ConfigurationPanelImpl.hpp \
DebugOutput.hpp \
DebugOutputImpl.cpp \
DebugOutputImpl.hpp \
Event.cpp \
Event.hpp \
EventFactory.hpp \
EventFactory.inl \
Factory.hpp \
Factory.inl \
JPushButton.cpp JPushButton.hpp \
Launcher.cpp \
Launcher.hpp \
NumericKeypad.cpp \
NumericKeypad.hpp \
ObjectFactory.hpp \
ObjectFactory.inl \
ObjectPool.hpp \
ObjectPool.inl \
PhoneLine.cpp \
PhoneLine.hpp \
PhoneLineButton.cpp \
PhoneLineButton.hpp \
PhoneLineLocker.cpp \
PhoneLineLocker.hpp \
PhoneLineManager.hpp \
PhoneLineManagerImpl.cpp \
PhoneLineManagerImpl.hpp \
QjListBoxPixmap.cpp \
QjListBoxPixmap.hpp \
Request.cpp \
Request.hpp \
Requester.hpp \
RequesterImpl.cpp \
RequesterImpl.hpp \
RequesterImpl.inl \
SFLCallStatus.hpp \
SFLEvents.cpp \
SFLEvents.hpp \
SFLLcd.cpp \
SFLLcd.hpp \
SFLPhoneApp.cpp \
SFLPhoneApp.hpp \
SFLPhoneWindow.cpp \
SFLPhoneWindow.hpp \
SFLRequest.cpp \
SFLRequest.hpp \
Session.cpp \
Session.hpp \
SessionFactory.hpp \
SessionIO.hpp \
SessionIOFactory.hpp \
SkinManager.hpp \
SkinManagerImpl.cpp \
SkinManagerImpl.hpp \
TCPSessionIO.cpp \
TCPSessionIO.hpp \
TCPSessionIOCreator.cpp \
TCPSessionIOCreator.hpp \
TransparentWidget.cpp \
TransparentWidget.hpp \
Url.cpp \
Url.hpp \
VolumeControl.cpp \
VolumeControl.hpp \
globals.h \
main.cpp \
ConfigurationPanel.ui.h
CLEANFILES = \
$(BUILT_SOURCES)
......@@ -122,6 +122,8 @@ sflphone_qt_LDADD = $(top_srcdir)/libs/taxidermy/libtaxidermy.la $(QT_LIBS)
AM_CPPFLAGS = -I$(top_srcdir)/libs/ $(QT_CXXFLAGS) $(X_INCLUDES) $(all_includes)
AM_LDFLAGS = $(QT_LDADD) $(X_LDFLAGS) $(all_libraries)
#AM_CPPFLAGS = -I$(top_srcdir)/libs $(QT_CXXFLAGS)
#sflphone_qt_LDADD = $(QT_LDADD)
qmake_image_collection.cpp: $(IMAGES)
......
src/managerimpl.cpp
View file @ 79f69cc7
......@@ -1018,7 +1018,7 @@ ManagerImpl::initConfigFile (void)
fill_config_int(SEND_DTMF_AS, SIP_INFO_STR);
section = AUDIO;
fill_config_int(DRIVER_NAME, DFT_DRIVER_STR);
//fill_config_int(DRIVER_NAME, DFT_DRIVER_STR);
fill_config_int(DRIVER_NAME_IN, DFT_DRIVER_STR);
fill_config_int(DRIVER_NAME_OUT, DFT_DRIVER_STR);
fill_config_int(DRIVER_SAMPLE_RATE, DRIVER_SAMPLE_RATE_DEFAULT);
......@@ -1081,7 +1081,7 @@ ManagerImpl::initAudioDriver(void)
void
ManagerImpl::selectAudioDriver (void)
{
int noDevice = getConfigInt(AUDIO, DRIVER_NAME);
//int noDevice = getConfigInt(AUDIO, DRIVER_NAME);
int noDeviceIn = getConfigInt(AUDIO, DRIVER_NAME_IN);
int noDeviceOut = getConfigInt(AUDIO, DRIVER_NAME_OUT);
int sampleRate = getConfigInt(AUDIO, DRIVER_SAMPLE_RATE);
......@@ -1092,9 +1092,10 @@ ManagerImpl::selectAudioDriver (void)
// this is when no audio device in/out are set
// or the audio device in/out are set to 0
// we take the nodevice instead
if (noDeviceIn == 0 && noDeviceOut == 0) {
noDeviceIn = noDeviceOut = noDevice;
}
// remove this hack, how can we change the device to 0, if the noDevice is 1?
//if (noDeviceIn == 0 && noDeviceOut == 0) {
// noDeviceIn = noDeviceOut = noDevice;
//}
_debugInit(" AudioLayer Opening Device");
_audiodriver->setErrorMessage("");
_audiodriver->openDevice(noDeviceIn, noDeviceOut, sampleRate);
......
Markdown is supported
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