# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1277126293 -10800
# Node ID 13725ba124847efa81d144968feb1a08771a1ebd
# Parent  6bf66e3b8f31bcc32594b8230bd1811466b5d20c
Revision: 201022
Kit: 2010125

diff -r 6bf66e3b8f31 -r 13725ba12484 cbs/CbsServer/ServerInc/CbsLogger.h
--- a/cbs/CbsServer/ServerInc/CbsLogger.h	Wed Jun 09 10:18:03 2010 +0300
+++ b/cbs/CbsServer/ServerInc/CbsLogger.h	Mon Jun 21 16:18:13 2010 +0300
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef CBSLOGGER_H
 #define CBSLOGGER_H
 
@@ -30,12 +28,11 @@
     #define CBS_LOGGING_METHOD  0   // No logging in UREL builds
 #else
     // UDEB BUILD:
-    #define CBS_LOGGING_METHOD  1   // 0 = No logging, 
-                                        // 1 = Flogger, 
-                                        // 2 = RDebug
+    #define CBS_LOGGING_METHOD  2   // 0 = No logging, 
+                                    // 1 = Flogger, 
+                                    // 2 = RDebug
 #endif //_DEBUG
 
-
 #if CBS_LOGGING_METHOD > 0
     #define CBS_LOGGING_ENABLED     // This is for backward compatibility
 #endif //CBS_LOGGING_METHOD 
@@ -58,7 +55,6 @@
 
 #endif //CBS_LOGGING_METHOD
 
-
 /*
 -----------------------------------------------------------------------------
     LOGGING MACROs
@@ -67,7 +63,6 @@
 -----------------------------------------------------------------------------
 */
 
-
 #if CBS_LOGGING_METHOD == 1      // Flogger
 
 #define CBSLOGTEXT(AAA) /*lint -save -e960 */              { RFileLogger::Write(KCbsLogFolder(),KCbsLogFile(),EFileLoggingModeAppend,AAA); } /*lint -restore */
diff -r 6bf66e3b8f31 -r 13725ba12484 convergedcallengine/csplugin/src/cspcall.cpp
--- a/convergedcallengine/csplugin/src/cspcall.cpp	Wed Jun 09 10:18:03 2010 +0300
+++ b/convergedcallengine/csplugin/src/cspcall.cpp	Mon Jun 21 16:18:13 2010 +0300
@@ -194,7 +194,8 @@
             // If audio still active
             if ( iAudioStatus == ECSPCallAudioStatusActive 
                  && iAudioHandler
-                 && iParams->CallType() == CCPCall::ECallTypeCSVoice )
+                 && ( iParams->CallType() == CCPCall::ECallTypeCSVoice 
+                    || iParams->CallType() == CCPCall::ECallTypeVideo ) )
                 {
                 iAudioStatus = ECSPCallAudioStatusInactive;
                 iAudioHandler->Stop();
@@ -215,7 +216,9 @@
         case RMobileCall::EStatusDialling:
             CSPLOGSTRING(CSPINT, "CSPCall callstate Dialling");
             {
-            if ( iAudioHandler && iParams->CallType() == CCPCall:: ECallTypeCSVoice )
+            if ( iAudioHandler 
+                 && ( iParams->CallType() == CCPCall::ECallTypeCSVoice 
+                    || iParams->CallType() == CCPCall::ECallTypeVideo ) )
                 {
                 iAudioStatus = ECSPCallAudioStatusActive;
                 iAudioHandler->Start();