Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

daemon/src/global.h

@@ -76,7 +76,7 @@ const char * const ZRTP_ZID_FILENAME = "sfl.zid";
 // Define the audio api
 #define PULSEAUDIO_API_STR          "pulseaudio"
 #define ALSA_API_STR                "alsa"
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
 #define DEFAULT_AUDIO_API_STR PULSEAUDIO_API_STR
 #else
 #define DEFAULT_AUDIO_API_STR ALSA_API_STR

daemon/src/preferences.cpp

@@ -84,7 +84,7 @@ static const char * const URL_SIP_FIELD_KEY = "urlSipField";
 
 // audio preferences
 static const char * const ALSAMAP_KEY = "alsa";
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
 static const char * const PULSEMAP_KEY = "pulse";
 #endif
 static const char * const CARDIN_KEY = "cardIn";
@@ -367,7 +367,7 @@ void checkSoundCard(int &card, int stream)
 
 AudioLayer* AudioPreference::createAudioLayer()
 {
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
     if (audioApi_ == PULSEAUDIO_API_STR) {
         if (system("ps -C pulseaudio > /dev/null") == 0)
             return new PulseLayer;
@@ -386,7 +386,7 @@ AudioLayer* AudioPreference::createAudioLayer()
 
 AudioLayer* AudioPreference::switchAndCreateAudioLayer()
 {
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
     if (audioApi_ == PULSEAUDIO_API_STR)
         audioApi_ = ALSA_API_STR;
     else
@@ -453,7 +453,7 @@ void AudioPreference::serialize(Conf::YamlEmitter &emitter)
     alsapreferencemap.setKeyValue(PLUGIN_KEY, &plugin);
     alsapreferencemap.setKeyValue(SMPLRATE_KEY, &alsaSmplrate);
 
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
     Conf::MappingNode pulsepreferencemap(NULL);
     preferencemap.setKeyValue(PULSEMAP_KEY, &pulsepreferencemap);
     pulsepreferencemap.setKeyValue(DEVICE_PLAYBACK_KEY, &pulseDevicePlayback);
@@ -489,7 +489,7 @@ void AudioPreference::unserialize(const Conf::MappingNode &map)
         alsamap->getValue(PLUGIN_KEY, &alsaPlugin_);
     }
 
-#if HAVE_PULSE == 1
+#if HAVE_PULSE
     Conf::MappingNode *pulsemap =(Conf::MappingNode *)(map.getValue("pulse"));
 
     if (pulsemap) {

daemon/test/audiolayertest.cpp

@@ -44,18 +44,18 @@ void AudioLayerTest::testAudioLayerConfig()
 {
     TITLE();
 
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getSmplrate() == 44100);
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaSmplrate() == 44100);
 
     // alsa preferences
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getCardin() == 0);
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getCardout() == 0);
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getCardring() == 0);
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getPlugin() == "default");
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaCardin() == 0);
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaCardout() == 0);
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaCardring() == 0);
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaPlugin() == "default");
 
     // pulseaudio preferences
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getDevicePlayback() == "alsa_output.pci-0000_00_1b.0.analog-stereo");
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getDeviceRecord() == "alsa_input.pci-0000_00_1b.0.analog-stereo");
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getDeviceRingtone() == "alsa_output.pci-0000_00_1b.0.analog-stereo");
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getPulseDevicePlayback() == "alsa_output.pci-0000_00_1b.0.analog-stereo");
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getPulseDeviceRecord() == "alsa_input.pci-0000_00_1b.0.analog-stereo");
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getPulseDeviceRingtone() == "alsa_output.pci-0000_00_1b.0.analog-stereo");
 
     CPPUNIT_ASSERT(Manager::instance().audioPreference.getVolumemic() == 100);
     CPPUNIT_ASSERT(Manager::instance().audioPreference.getVolumespkr() == 100);

daemon/test/configurationtest.cpp

@@ -43,10 +43,10 @@ void ConfigurationTest::testDefaultValueAudio()
 {
     TITLE();
 
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getCardin() == ALSA_DFT_CARD_ID);
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getCardout() == ALSA_DFT_CARD_ID);
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getSmplrate() == 44100);
-    CPPUNIT_ASSERT(Manager::instance().audioPreference.getPlugin() == PCM_DEFAULT);
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaCardin() == ALSA_DFT_CARD_ID);
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaCardout() == ALSA_DFT_CARD_ID);
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaSmplrate() == 44100);
+    CPPUNIT_ASSERT(Manager::instance().audioPreference.getAlsaPlugin() == PCM_DEFAULT);
     CPPUNIT_ASSERT(Manager::instance().audioPreference.getVolumespkr() == 100);
     CPPUNIT_ASSERT(Manager::instance().audioPreference.getVolumemic() == 100);
 }

tools/build-system/launch-build-machine-2.sh

@@ -219,10 +219,9 @@ END
 	fi
 
 	if [ "${LAUNCHPAD_PACKAGE}"  == "sflphone-client-kde" ]; then
-		#echo >  ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/debian/changelog
-		sed -i -e 's/Standards-Version: [0-9.A-Za-z]*/Standards-Version: 1.1.2/' ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/debian/control
-echo ${VERSION} `echo ${VERSION} | grep -e '[0-9]*\.[0-9.]*' -o | head -n1`
-		tar -cjf ${LAUNCHPAD_DIR}/sflphone-client-kde_$(echo ${VERSION}  | grep -e '[0-9]*\.[0-9.]*' -o | head -n1).orig.tar.bz2  ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/
+		version_kde=$(echo ${VERSION}  | grep -e '[0-9]*\.[0-9.]*' -o | head -n1)
+		sed -i -e "s/Standards-Version: [0-9.A-Za-z]*/Standards-Version: ${version_kde}/" ${LAUNCHPAD_DIR}/${LAUNCHPAD_PACKAGE}/debian/control
+		tar -C ${LAUNCHPAD_DIR}/ -cjf ${LAUNCHPAD_DIR}/sflphone-client-kde_${version_kde}.orig.tar.bz2  ${LAUNCHPAD_PACKAGE}
 	fi
 
 	rm -f ${WORKING_DIR}/sfl-git-dch.conf >/dev/null 2>&1

tools/build-system/launchpad/sflphone-client-kde/debian/changelog

+sflphone-client-kde (1.1.0-rc20120607~ppa1~SYSTEM) SYSTEM; urgency=low
+
+    ** SNAPSHOT 1.1.0-rc20120607~ppa1~SYSTEM **
+
+  * [ #12096 ] Implement more calls details, make it more scalable
+  * [ #11290 ] Update french translation
+  * [ #11859 ] Fix a regression in name conversion
+  * [ #11850 ] Fix a little regression
+  * [ #11859 ] Fix sorting by popularity
+  * [ #11569 ] Fix filter
+  * [ #12003  ] Add icon overlay for history item
+  * [ #11886 ] Add basic reverse peer naming support
+  * kde/callview: removed trailing whitespace
+  * [ #12008 ] Implement GUI part
+  * [ #11988 ] Move ringtone to a new tab
+  * [ #11990 ] Fix history delegate width
+  * [ #11990 ] Make call item height configurable
+  * [ #7007 ] Fix many history bugs and add 'copy' contextual menu
+  * [ #7007 ] Add more contextual options
+
+ -- Julien Bonjean <julien.bonjean@savoirfairelinux.com>  Thu, 07 Jun 2012 15:52:52 -0400
+
 sflphone-client-kde (1.1.0) SYSTEM; urgency=low
 
     ** SNAPSHOT 1.0.0-rc20110930~ppa1~SYSTEM **

tools/build-system/launchpad/sflphone-client-kde/debian/control

@@ -3,7 +3,7 @@ Section: kde
 Priority: optional
 Maintainer: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
 Uploaders: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
-Standards-Version: 1.1.2
+Standards-Version: 1.1.0
 Build-Depends: debhelper (>= 5.0), cdbs, kdelibs5-dev, cmake, kdepimlibs5-dev,
 Homepage: http://www.sfphone.org/