r3557 - in trunk: libminisip/include/libminisip/media libminisip/source/subsystem_media minisip/minisip/gui/confgui

[blerta at minisip.org]

Author: blerta
Date: 2007-12-14 15:02:15 +0100 (Fri, 14 Dec 2007)
New Revision: 3557

Modified:
   trunk/libminisip/include/libminisip/media/MediaCommandString.h
   trunk/libminisip/source/subsystem_media/MediaCommandString.cxx
   trunk/minisip/minisip/gui/confgui/minisip_confgui.cxx
Log:
Changes to add video forwarding for the conference gui, Blerta Bishaj.


Modified: trunk/libminisip/include/libminisip/media/MediaCommandString.h
===================================================================
--- trunk/libminisip/include/libminisip/media/MediaCommandString.h	2007-12-14 10:25:43 UTC (rev 3556)
+++ trunk/libminisip/include/libminisip/media/MediaCommandString.h	2007-12-14 14:02:15 UTC (rev 3557)
@@ -58,6 +58,9 @@
 		static const std::string audio_forwarding_enable;
 		static const std::string audio_forwarding_disable;
 
+		static const std::string video_forwarding_enable;
+                static const std::string video_forwarding_disable;
+
 		static const std::string send_dtmf;
 		
 	

Modified: trunk/libminisip/source/subsystem_media/MediaCommandString.cxx
===================================================================
--- trunk/libminisip/source/subsystem_media/MediaCommandString.cxx	2007-12-14 10:25:43 UTC (rev 3556)
+++ trunk/libminisip/source/subsystem_media/MediaCommandString.cxx	2007-12-14 14:02:15 UTC (rev 3557)
@@ -40,4 +40,7 @@
 const string MediaCommandString::audio_forwarding_enable="audio_forwarding_enable";
 const string MediaCommandString::audio_forwarding_disable="audio_forwarding_disable";
 
+const string MediaCommandString::video_forwarding_enable="video_forwarding_enable";
+const string MediaCommandString::video_forwarding_disable="video_forwarding_disable";
+
 const string MediaCommandString::send_dtmf="send_dtmf";

Modified: trunk/minisip/minisip/gui/confgui/minisip_confgui.cxx
===================================================================
--- trunk/minisip/minisip/gui/confgui/minisip_confgui.cxx	2007-12-14 10:25:43 UTC (rev 3556)
+++ trunk/minisip/minisip/gui/confgui/minisip_confgui.cxx	2007-12-14 14:02:15 UTC (rev 3557)
@@ -7,19 +7,11 @@
 #include<libminisip/media/MediaCommandString.h>
 #include<libminisip/signaling/conference/ConferenceControl.h>
 #include<libminisip/signaling/conference/ConfMessageRouter.h>
-#include<libminisip/signaling/sip/SipSoftPhoneConfiguration.h>
-#include<libminisip/contacts/ContactDb.h>
-#include<libminisip/contacts/PhoneBook.h>
 
 
+//do we have access to the paths of the config files from here???
 
-//cleanup, how to get username and domain separately
-//set_session_sound_settings also in incoming_available?
-//audio_forwarding_enable is done ok in invite_ok?
-//should it be done also in incoming_available?
 
-
-
 using namespace std;
 
 class MyGui : public Gui{
@@ -45,16 +37,16 @@
 				for( entryIter = contactEntries.begin(); entryIter != contactEntries.end(); entryIter++ ){
                                         if( SipUri((*entryIter)->getUri()) == SipUri(command.getParam()) ){                 
 					        cerr << "MyGui: incoming call from: " << command.getParam() << endl;
-                	                        CommandString resp(command.getDestinationId(), "accept_invite");
+
+						callId = command.getDestinationId();
+
+                	                        CommandString resp(callId, "accept_invite");
                                 		sendCommand("sip", resp);
 
-						callId = command.getDestinationId();
-						CommandString cmdstr(callId,
-		                                        MediaCommandString::audio_forwarding_enable/*,
-                		                        "senders", "ON"*/);
+						CommandString cmdstr(callId, MediaCommandString::audio_forwarding_enable);
                                 		sendCommand("media", cmdstr);
-
-                                                cerr << "***** INCOMING *** AVAILABLE ***** " << description << endl;
+						CommandString cmdstr2(callId, MediaCommandString::video_forwarding_enable);
+                                		sendCommand("media", cmdstr2);
 					}
                                 }
                         }
@@ -62,6 +54,12 @@
 			//registered suceessfully with ser
                         if(command.getOp() == "register_ok"){ 
 			        inviteAllContacts();
+				//callUser("2000 at dhcp-125-198.ssvl.kth.se");
+				//callUser("2001 at dhcp-125-198.ssvl.kth.se");
+				//callUser("2002 at dhcp-125-198.ssvl.kth.se");
+				////callUser("bbishaj at ekiga.net");
+				////callUser("erik at users.minisip.org");
+				//callUser("9999 at pstn-gw.ssvl.kth.se");
                         }
 
 			//the user accepted the call
@@ -72,13 +70,14 @@
                                 	"senders", "ON");
                 		sendCommand("media", cmdstr1);
 				
-				CommandString cmdstr2( callId,
-                                        MediaCommandString::audio_forwarding_enable/*,
-                                        "senders", "ON"*/);
+				CommandString cmdstr2( callId, MediaCommandString::audio_forwarding_enable);
                                 sendCommand("media", cmdstr2);
+				CommandString cmdstr(callId, MediaCommandString::video_forwarding_enable);
+                                		sendCommand("media", cmdstr);
 
 				description = "ACCEPT_CALL " + callId;
 
+				cerr << "EEEE: number of entries: " << contactEntries.size()<<endl; 
 				for( entryIter = contactEntries.begin(); entryIter != contactEntries.end(); entryIter++ ){
 					if( SipUri((*entryIter)->getUri()) == SipUri(command.getParam()) ){
 						cerr << "***** ACCEPTED *** CALL ***** " << description << endl;
@@ -126,6 +125,7 @@
 						break;
 		              		}
 		      		}
+			
 			}
 			cleanup();
 		}
@@ -191,7 +191,9 @@
                         std::string rmContactFile_cmd;
 
 			myIdentity = 	    config->defaultIdentity->getSipUri();
-			rmSerUser_cmd =     "./script rm " + myIdentity.getUserIpString() + " " + myIdentity.getIp(); // domain_name
+			rmSerUser_cmd =     "./script rm " + myIdentity.getUserIpString(); // + username + domain_name
+			//test10 dhcp-125-198.ssvl.kth.se
+			//serctl rm " + myIdentity.getUserIpString();
 			rmConfigFile_cmd =  "rm ";
 			rmContactFile_cmd = "rm ";