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

sflphone-client-gnome/src/config/accountconfigdialog.c

@@ -3,6 +3,7 @@
  *  Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
  *  Author: Pierre-Luc Beaudoin <pierre-luc.beaudoin@savoirfairelinux.com>
  *  Author: Pierre-Luc Bacon <pierre-luc.bacon@savoirfairelinux.com>
+ *  Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -106,6 +107,9 @@ GtkWidget * overrtp;
 
 GHashTable * directIpCallsProperties = NULL;
 
+gchar *current_username;
+
+
 // Credentials
 enum {
 	COLUMN_CREDENTIAL_REALM,
@@ -193,12 +197,17 @@ static GPtrArray* getNewCredential (GHashTable * properties) {
 			-1);
 
 	g_hash_table_insert(properties, g_strdup(ACCOUNT_REALM), realm);
-	g_hash_table_insert(properties, g_strdup(ACCOUNT_AUTHENTICATION_USERNAME), username);
+
+	// better use the current_username as it is the account username in the 
+	// g_hash_table_insert(properties, g_strdup(ACCOUNT_AUTHENTICATION_USERNAME), username);
+	g_hash_table_insert(properties, g_strdup(ACCOUNT_AUTHENTICATION_USERNAME), current_username);
 
 	// Do not change the password if nothing has been changed by the user
 	if (g_strcasecmp (password, PW_HIDDEN) != 0)
 		g_hash_table_insert(properties, g_strdup(ACCOUNT_PASSWORD), password);
 
+	
+
 	valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(credentialStore), &iter);
 
 	while (valid) {        
@@ -1346,10 +1355,11 @@ void show_account_window (account_t * a) {
       return;
     }
 
+    gchar *key = g_strdup(ACCOUNT_USERNAME);
+
     // If accept button is 
     if (g_strcasecmp (currentAccount->accountID, IP2IP) != 0) {
 
-
       g_hash_table_replace(currentAccount->properties,
 			   g_strdup(ACCOUNT_ALIAS),
 			   g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryAlias))));
@@ -1368,6 +1378,10 @@ void show_account_window (account_t * a) {
       g_hash_table_replace(currentAccount->properties,
 			   g_strdup(ACCOUNT_MAILBOX),
 			   g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(entryMailbox))));   
+
+      // Variable used to update credentials
+      current_username = (gchar *)g_hash_table_lookup(currentAccount->properties, g_strdup(ACCOUNT_USERNAME));
+
     }
 
     if (proto && strcmp (proto, "SIP") == 0) {

sflphone-common/configure.ac

@@ -61,7 +61,6 @@ AC_CONFIG_FILES([Makefile])
 			src/audio/codecs/Makefile \
 			src/config/Makefile \
 			src/dbus/Makefile \
-			src/plug-in/audiorecorder/Makefile \
 			src/plug-in/Makefile \
 			src/plug-in/test/Makefile \
 			src/hooks/Makefile \

sflphone-common/src/Makefile.am

@@ -37,27 +37,8 @@ endif
 
 sflphoned_CXXFLAGS = \
 		-DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" $(IAX_CXXFLAG) $(NETWORKMANAGER) \
-		-DVERSION=\"$(VERSION)\" \
-		@ZRTPCPP_CFLAGS@ \
-		@libssl_CFLAGS@
-
-
-# Add here the dynamic libraries sflphoned should be linked against
-sflphoned_LDADD = \
-		./libsflphone.la \
-		@CCGNU2_LIBS@ \
-		@CCEXT2_LIBS@ \
-		@ZRTPCPP_LIBS@ \
-		$(PJSIP_LIBS) \
-		@CCRTP_LIBS@ \
-		@ALSA_LIBS@ \
-		@PULSEAUDIO_LIBS@ \
-		@SAMPLERATE_LIBS@ \
-		@libssl_LIBS@
-
-# sflphoned_LDFLAGS= -pg -luuid
-sflphoned_LDFLAGS= $(UUID_LIBS)
 		-DVERSION=\"$(VERSION)\"
+
 # libsflphone 
 
 sflphoned_LDADD = ./libsflphone.la
@@ -85,15 +66,9 @@ libsflphone_la_LIBADD = \
 	$(IAX_LIB) \
 	./sip/libsiplink.la \
 	./audio/libaudio.la \
-	./audio/audiortp/libaudiortp.la \
-	./audio/sound/libsound.la \
-	./audio/codecs/libcodecdescriptor.la \
-	./audio/alsa/libalsalayer.la \
-	./audio/pulseaudio/libpulselayer.la \
 	./dbus/libdbus.la \
 	./config/libconfig.la \
 	./plug-in/libplugin.la \
-	./plug-in/audiorecorder/libaudiorecorder.la \
 	./hooks/libhooks.la \
 	./history/libhistory.la
 
@@ -101,9 +76,6 @@ libsflphone_la_LDFLAGS = \
 		@CCGNU2_LIBS@ \
 		@CCEXT2_LIBS@ \
 		@ZRTPCPP_LIBS@ \
-		@GSTREAMER_LIBS@ \
-		@LIBAVCODEC_LIBS@ \
-		@LIBSWSCALE_LIBS@ \
 		$(PJSIP_LIBS) \
 		@CCRTP_LIBS@ \
 		@ALSA_LIBS@ \
@@ -116,9 +88,6 @@ libsflphone_la_CFLAGS = \
 		@CCGNU2_CFLAGS@ \
 		@CCEXT2_CFLAGS@ \
 		@ZRTPCPP_CFLAGS@ \
-		@GSTREAMER_CFLAGS@ \
-		@LIBAVCODEC_CFLAGS@ \
-		@LIBSWSCALE_CFLAGS@ \
 		$(PJSIP_CFLAGS) \
 		@CCRTP_CFLAGS@ \
 		@ALSA_CFLAGS@ \

sflphone-common/src/audio/Makefile.am

@@ -12,6 +12,8 @@ libaudio_la_SOURCES = \
 		audioloop.cpp \
 		ringbuffer.cpp \
 		mainbuffer.cpp \
+		audiorecord.cpp \
+		audiorecorder.cpp \
 		recordable.cpp \
 		audiolayer.cpp \
 		audiodevice.cpp \
@@ -28,9 +30,11 @@ noinst_HEADERS = \
 		audioloop.h \
 		common.h \
 		ringbuffer.h \
+		mainbuffer.h \
+		audiorecord.h \
+		audiorecorder.h \
 		audiolayer.h \
 		audiodevice.h \
-		mainbuffer.h \
 	 	recordable.h \
 		algorithm.h \
 		delaydetection.h \

sflphone-common/src/audio/audiolayer.h

@@ -37,20 +37,17 @@
 #include "audiodevice.h"
 #include "ringbuffer.h"
 #include "mainbuffer.h"
-
-#include <cc++/thread.h> // for ost::Mutex
-
 #include "dcblocker.h"
 #include "speexechocancel.h"
 #include "echocancel.h"
 
+#include <cc++/thread.h> // for ost::Mutex
 
 /**
  * @file  audiolayer.h
  * @brief Main sound class. Manages the data transfers between the application and the hardware. 
  */
 
-class Recordable;
 class ManagerImpl;
 
 class AudioLayer {

sflphone-common/src/plug-in/audiorecorder/audiorecord.cpp → sflphone-common/src/audio/audiorecord.cpp

@@ -120,8 +120,6 @@ void AudioRecord::initFileName (std::string peerNumber)
 void AudioRecord::openFile()
 {
 
-    _info ("AudioRecord: Open file()");
-
     bool result = false;
 
     _debug ("AudioRecord: Open file()");
@@ -408,6 +406,8 @@ void AudioRecord::closeWavFile()
         return;
     }
 
+    _debug("AudioRecord: Close wave file");
+
 
     SINT32 bytes = byteCounter_ * channels_;
 
@@ -499,6 +499,8 @@ void AudioRecord::recData (SFLDataFormat* buffer_1, SFLDataFormat* buffer_2, int
 
     if (recordingEnabled_) {
 
+      _debug("Recording enabled");
+
         if (fp == 0) {
             _debug ("AudioRecord: Can't record data, a file has not yet been opened!");
             return;

sflphone-common/src/plug-in/audiorecorder/audiorecord.h → sflphone-common/src/audio/audiorecord.h

@@ -36,10 +36,7 @@
 #include <stdlib.h>
 #include <sstream>
 
-#include "plug-in/plugin.h"
-// #include "audiodsp.h"
-
-// class AudioDSP;
+#include "global.h"
 
 using namespace std;
 

sflphone-common/src/plug-in/audiorecorder/audiorecorder.cpp → sflphone-common/src/audio/audiorecorder.cpp

@@ -29,13 +29,28 @@
  */
 
 #include "audiorecorder.h"
+#include "mainbuffer.h"
 
-AudioRecorder::AudioRecorder (AudioRecord  *arec)
-  : Thread(), recorderId("recorder_id")
+int AudioRecorder::count = 0;
+
+AudioRecorder::AudioRecorder (AudioRecord  *arec, MainBuffer *mb) : Thread()
 {
     setCancel (cancelDeferred);
 
+    ++count;
+
+    std::string id("processid_");
+
+    // convert count into string
+    std::string s;
+    std::stringstream out;
+    out << count;
+    s = out.str();
+
+    recorderId = id.append(s);
+
     arecord = arec;
+    mbuffer = mb;    
 }
 
 
@@ -44,13 +59,26 @@ AudioRecorder::AudioRecorder (AudioRecord  *arec)
  */
 void AudioRecorder::run (void)
 {
-
     SFLDataFormat buffer[10000];
 
-    // int availBytes = mbuffer->availForGet(recorderId);
+    while(true) {
+
+      if(!mbuffer)
+	_warn("AudioRecorder: Error: No instance of ringbuffer");
 
-    // mbuffer->getData(buffer, availBytes, 100, recorderId);
+      int availBytes = mbuffer->availForGet(recorderId);
 
-    // arecord->recData(buffer, availBytes/sizeof(SFLDataFormat));
+      if(availBytes > 0) {
+
+	  int got = mbuffer->getData(buffer, availBytes, 100, recorderId);
+
+	  int availBytesAfter = mbuffer->availForGet(recorderId);
+
+	  arecord->recData(buffer, availBytes/sizeof(SFLDataFormat));
+      }
+
+      sleep(20);
+
+    }
 
 }

sflphone-common/src/plug-in/audiorecorder/audiorecorder.h → sflphone-common/src/audio/audiorecorder.h

@@ -35,13 +35,17 @@
 #include "audiorecord.h"
 #include <string>
 
+class MainBuffer;
+
 class AudioRecorder : public ost::Thread {
 
    public:
-      AudioRecorder(AudioRecord  *arec);
+      AudioRecorder(AudioRecord  *arec, MainBuffer *mb);
 
       ~AudioRecorder(void){ terminate(); }
 
+      static int count;
+
       std::string getRecorderID() { return recorderId; }
 
       virtual void run();
@@ -50,10 +54,10 @@ class AudioRecorder : public ost::Thread {
       AudioRecorder (const AudioRecorder& ar);
       AudioRecorder& operator=(const AudioRecorder& ar);
 
-      // MainBuffer *mbuffer;
-
       std::string recorderId;
 
+      MainBuffer *mbuffer;
+
       AudioRecord *arecord;
 };
 

sflphone-common/src/audio/audiortp/AudioRtpSession.h

@@ -736,10 +736,10 @@ namespace sfl {
 
         // DTMF over RTP, size must be over 4 in order to process it as voice data
         if(size > 4) {
-	    // processDataDecode(spkrDataIn, size);
-	    if(result == JB_OK) {
-	      processDataDecode((unsigned char *)(frame.data), 160);
-	    }
+	    processDataDecode(spkrDataIn, size);
+	  //if(result == JB_OK) {
+	  //   processDataDecode((unsigned char *)(frame.data), 160);
+	  //}
         }
 
 	delete adu;
@@ -815,6 +815,8 @@ namespace sfl {
             // Recv session
             receiveSpeakerData ();
 
+	    /*
+
             // Let's wait for the next transmit cycle
             if (sessionWaiting == 1) {
                 // Record mic and speaker during conversation
@@ -823,6 +825,7 @@ namespace sfl {
                 // Record mic only while leaving a message
                 _ca->recAudio.recData (_micData,_nSamplesMic);
             }
+	    */
 
             _manager->getAudioLayerMutex()->leave();
 

sflphone-common/src/audio/dcblocker.cpp

@@ -54,7 +54,7 @@ void DcBlocker::process (SFLDataFormat *data, int nbBytes)
     for (int i = 0; i < nbSamples; i++) {
         _x = data[i];
 
-        _y = (SFLDataFormat) ( (float) _x - (float) _xm1 + 0.9999 * (float) _ym1);
+        _y = (SFLDataFormat) ( (float) _x - (float) _xm1 + 0.995 * (float) _ym1);
         _xm1 = _x;
         _ym1 = _y;
 

sflphone-common/src/audio/mainbuffer.cpp

@@ -255,23 +255,33 @@ void MainBuffer::unBindCallID (CallID call_id1, CallID call_id2)
     }
 }
 
-void MainBuffer::unBindHalfDuplexOut(CallID call_id, CallID process_id)
+void MainBuffer::unBindHalfDuplexOut(CallID process_id, CallID call_id)
 {
 
   removeCallIDfromSet(process_id, call_id);
 
-  RingBuffer* ringbuffer;
-
-  ringbuffer = getRingBuffer(process_id);
+  RingBuffer* ringbuffer = getRingBuffer(call_id);
 
   if(ringbuffer) {
-    ringbuffer->removeReadPointer(call_id);
+    ringbuffer->removeReadPointer(process_id);
 
     if(ringbuffer->getNbReadPointer() == 0) {
+      removeCallIDSet(call_id);
+      removeRingBuffer(call_id);
+    }
+  }
+  else {
+    _debug("Error: did not found ringbuffer %s", process_id.c_str());
     removeCallIDSet(process_id);
-      removeRingBuffer(process_id);
   }
+
+  
+  CallIDSet* callid_set = getCallIDSet(process_id);
+  if(callid_set) {
+    if(callid_set->empty())
+      removeCallIDSet(process_id);
   }
+
 }
 
 
@@ -387,9 +397,7 @@ int MainBuffer::getData (void *buffer, int toCopy, unsigned short volume, CallID
             return 0;
     } else {
 
-        for (int k = 0; k < nbSmplToCopy; k++) {
-            ( (SFLDataFormat*) (buffer)) [k] = 0;
-        }
+        memset(buffer, 0, nbSmplToCopy*sizeof(SFLDataFormat*));
 
         int size = 0;
 

sflphone-common/src/audio/mainbuffer.h

@@ -37,12 +37,10 @@
 #include <cc++/thread.h> // for ost::Mutex
 #include <string>
 
-#include "../global.h"
-#include "../call.h"
+#include "global.h"
+#include "call.h"
 #include "ringbuffer.h"
 
-
-
 typedef std::map<CallID, RingBuffer*> RingBufferMap;
 
 typedef std::set<CallID> CallIDSet;

sflphone-common/src/audio/recordable.cpp

@@ -29,9 +29,8 @@
 
 #include "recordable.h"
 #include "manager.h"
-#include "mainbuffer.h"
 
-Recordable::Recordable() : recorder(&recAudio)
+Recordable::Recordable() : recorder(&recAudio, Manager::instance().getMainBuffer())
 {
 
     FILE_TYPE fileType = FILE_WAV;

sflphone-common/src/audio/recordable.h

@@ -30,8 +30,8 @@
 #ifndef RECORDABLE_H
 #define RECORDABLE_H
 
-#include "../plug-in/audiorecorder/audiorecord.h"
-#include "../plug-in/audiorecorder/audiorecorder.h"
+#include "audiorecord.h"
+#include "audiorecorder.h"
 
 class Recordable {
 
@@ -41,14 +41,30 @@ class Recordable {
 
 	~Recordable();
 
+	/**
+	 * Return recording state (true/false)
+	 */
 	bool isRecording(){ return recAudio.isRecording(); }
 
+	/**
+	 * This method must be implemented for this interface as calls and conferences 
+	 * have different behavior.
+	 */ 
 	virtual bool setRecording() = 0;
 
+	/**
+	 * Stop recording
+	 */
 	void stopRecording(){ recAudio.stopRecording(); }
 
+	/**
+	 * Init the recording file name according to path specified in configuration
+	 */ 
 	void initRecFileName();
 
+	/**
+	 * Set recording sampling rate.
+	 */
 	void setRecordingSmplRate(int smplRate);
 
 	virtual std::string getRecFileId() = 0;
@@ -64,11 +80,6 @@ class Recordable {
 
 	 AudioRecorder recorder;
 
-    private:
-
-	/** File name for his call : time YY-MM-DD */
-        // std::string _filename;        
-
 };
 
 #endif

sflphone-common/src/call.cpp

@@ -189,18 +189,33 @@ Call::isAudioStarted()
 bool
 Call::setRecording()
 {
-    bool recordStatus = Recordable::recAudio.setRecording();
+    bool recordStatus = Recordable::recAudio.isRecording();
 
-    if(!recordStatus)
-      return false;
+    Recordable::recAudio.setRecording();
 
-    MainBuffer *mbuffer = &(Manager::instance()._mainBuffer);
+    // Start recording
+    if(!recordStatus) {
 
+      MainBuffer *mbuffer = Manager::instance().getMainBuffer();
       CallID process_id = Recordable::recorder.getRecorderID();
 
       mbuffer->bindHalfDuplexOut(process_id, _id);
       mbuffer->bindHalfDuplexOut(process_id);
 
+    }
+    // Stop recording
+    else {
+
+      MainBuffer *mbuffer = Manager::instance().getMainBuffer();      
+      CallID process_id = Recordable::recorder.getRecorderID();
+
+      mbuffer->unBindHalfDuplexOut(process_id, _id);
+      mbuffer->unBindHalfDuplexOut(process_id);
+
+    }
+
+    Manager::instance().getMainBuffer()->stateInfo();
+
     Recordable::recorder.start();
   
     return recordStatus;

sflphone-common/src/call.h

@@ -35,7 +35,6 @@
 #include <cc++/thread.h> // for mutex
 #include <sstream>
 
-// #include "plug-in/audiorecorder/audiorecord.h"
 #include "audio/recordable.h"
 
 #define SIP_SCHEME       "sip:"

sflphone-common/src/conference.cpp

@@ -162,12 +162,14 @@ ParticipantSet Conference::getParticipantList()
 
 bool Conference::setRecording() {
 
-  bool recordStatus = Recordable::recAudio.setRecording();
+  bool recordStatus = Recordable::recAudio.isRecording();
 
-  if(!recordStatus)
-    return false;
+  Recordable::recAudio.setRecording();
 
-  MainBuffer *mbuffer = &(Manager::instance()._mainBuffer);
+  // start recording
+  if(!recordStatus){
+
+    MainBuffer *mbuffer = Manager::instance().getMainBuffer();
 
     ParticipantSet::iterator iter = _participants.begin();
 
@@ -180,6 +182,26 @@ bool Conference::setRecording() {
 
     mbuffer->bindHalfDuplexOut(process_id);
 
+  }
+  // stop recording
+  else {
+
+      MainBuffer *mbuffer = Manager::instance().getMainBuffer();      
+
+      ParticipantSet::iterator iter = _participants.begin();
+
+      CallID process_id = Recordable::recorder.getRecorderID();
+
+      while(iter != _participants.end()) {
+	mbuffer->unBindHalfDuplexOut(process_id, *iter);
+	iter++;
+      }
+
+      mbuffer->unBindHalfDuplexOut(process_id);
+
+  }
+
+
   Recordable::recorder.start();
 
   return recordStatus;

sflphone-common/src/managerimpl.h

@@ -1240,7 +1240,6 @@ class ManagerImpl {
     void unloadAccountMap();
 
 
- public:
     /**
      * Instance of the MainBuffer for the whole application
      *
@@ -1251,6 +1250,14 @@ class ManagerImpl {
      MainBuffer _mainBuffer;
 
 
+ public:
+
+     /**
+      * Return a pointer to the  instance of the mainbuffer
+      */
+     MainBuffer *getMainBuffer(void) { return &_mainBuffer; }
+
+
     /**
      * Tell if there is a current call processed
      * @return bool True if there is a current call