Changeset 27

Timestamp:

01/21/08 08:30:28 (7 months ago)

Author:

sip

Message:

--

Files:

• mcuWeb/src/java/org/murillo/mcuWeb/Conference.java (modified) (1 diff)
• mcuWeb/src/java/org/murillo/mcuWeb/ConferenceMngr.java (modified) (3 diffs)
• mcuWeb/src/java/org/murillo/mcuWeb/MCUHttpServlet.java (modified) (4 diffs)
• mcuWeb/src/java/org/murillo/mcuWeb/MCUSipServlet.java (modified) (2 diffs)
• mcuWeb/src/java/org/murillo/mcuWeb/MediaMixer.java (modified) (2 diffs)
• mcuWeb/web/conference.jsp (modified) (4 diffs)

mcuWeb/src/java/org/murillo/mcuWeb/Conference.java

@@ -76 +76 @@
-        return participants;
-    }
-
+
+
+
+
-    public int getNumParcitipants() {
-        return participants.size();

mcuWeb/src/java/org/murillo/mcuWeb/ConferenceMngr.java

@@ -180 +180 @@
-    }
-    
-     
+
-        
-        String sdp = "v=0\r\n";
@@ -341 +341 @@
-    }
-
+
-    void setCompositionType(String confId, Integer compType, Integer size, String profileId) {
-        //Get conference
@@ -359 +360 @@
-        conf.setProfile(profile);
-    }
+
+    void setAudioMute(String confId, Integer partId, Boolean flag) {
+        //Get the conference
+        Conference conf = getConference(confId);
+        //And the video  Mute
+        MediaMixer mixer = conf.getMixer();
+        //And the participant
+        Participant part = conf.getParticipant(partId);
+        try {
+            //Depending on the state
+            if (!flag)
+                //UnMute
+                mixer.StartReceivingAudio(conf.getId(), partId);
+            else
+                //Mute
+                mixer.StopReceivingAudio(conf.getId(), partId);
+            //Set participant mute
+            part.setAudioMuted(flag);
+        } catch (XmlRpcException ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    void setVideoMute(String confId, Integer partId, Boolean flag) {
+        //Get the conference
+        Conference conf = getConference(confId);
+        //And the video Mute
+        MediaMixer mixer = conf.getMixer();
+        //And the participant
+        Participant part = conf.getParticipant(partId);
+        try {
+            //Depending on the state
+            if (!flag)
+                //UnMute
+                mixer.StartReceivingVideo(conf.getId(), partId);
+            else
+                //Mute
+                mixer.StopReceivingVideo(conf.getId(), partId);
+            //Set participant mute
+            part.setVideoMuted(flag);
+        } catch (XmlRpcException ex) {
+            ex.printStackTrace();
+        }
+    }
-   
-}

mcuWeb/src/java/org/murillo/mcuWeb/MCUHttpServlet.java

@@ -135 +135 @@
-            //Call
-            Participant part = joinParticipant(uid,dest);
+            //Redirect
+            response.sendRedirect("/mcuWeb/conference.jsp?uid=" + uid);
+        } else if(method.equals("removeParticipant")){
+            //Get parameters
+            String  uid  = request.getParameter("uid");
+            Integer partId  = Integer.parseInt(request.getParameter("partId"));
+            //Remove participant
+            removeParticipant(uid, partId);
+            //Redirect
+            response.sendRedirect("/mcuWeb/conference.jsp?uid=" + uid); 
+         } else if(method.equals("setVideoMute")){
+            //Get parameters
+            String  uid = request.getParameter("uid");
+            Integer partId = Integer.parseInt(request.getParameter("partId"));
+            Boolean flag = Boolean.parseBoolean(request.getParameter("flag"));
+            //Call
+            setVideoMute(uid, partId, flag);
+            //Redirect
+            response.sendRedirect("/mcuWeb/conference.jsp?uid=" + uid); 
+        }else if(method.equals("setAudioMute")){
+            //Get parameters
+            String  uid = request.getParameter("uid");
+            Integer partId = Integer.parseInt(request.getParameter("partId"));
+            Boolean flag = Boolean.parseBoolean(request.getParameter("flag"));
+            //Call
+            setAudioMute(uid, partId, flag);
-            //Redirect
-            response.sendRedirect("/mcuWeb/conference.jsp?uid=" + uid);
@@ -264 +290 @@
-        return part;
-    }
+    
+    private void removeParticipant(String confId, Integer partId)
+    {    
+        //Get the conference and participants
+        Conference conf = confMngr.getConference(confId);
+        Participant part = conf.getParticipant(partId);
+        //Get user session
+        SipSession session = part.getSession();
+        try{
+            //Create BYE request
+            SipServletRequest req = session.createRequest("BYE");
+            //Send it
+            req.send();
+        } catch(IOException ex){
+            ex.printStackTrace();
+        } catch(IllegalStateException ex){
+            ex.printStackTrace();
+        }
+        //Remover from conference
+        confMngr.removeParticipant(part);
+    }
-
-    private void removeConference(String uid) {
@@ -281 +328 @@
-        confMngr.removeConference(uid);
-    }
-   
+
-    private void setCompositionType(String confId, Integer compType, Integer size, String profileId) {
-       //Set composition type
@@ -296 +343 @@
-        confMngr.removeProfile(uid);
-    }
+
+     private void setAudioMute(String uid, Integer partId, Boolean flag) {
+        //Set audio Mute
+        confMngr.setAudioMute(uid, partId, flag);
+    }
+     
+    private void setVideoMute(String uid, Integer partId, Boolean flag) {
+        //Set video Mute
+        confMngr.setVideoMute(uid, partId, flag);
+    }
+    
-}

mcuWeb/src/java/org/murillo/mcuWeb/MCUSipServlet.java

@@ -90 +90 @@
-            if (confMngr.joinParticipant(part)) {
-                try {
-ringing
+final response
-                    SipServletResponse resp = request.createResponse(200, "Ok");
-                    //Attach body
@@ -114 +114 @@
-        //Remove participant
-        confMngr.removeParticipant(part);
-
-
+
+
+
+
+
+
+
+
+
-    }
-

mcuWeb/src/java/org/murillo/mcuWeb/MediaMixer.java

@@ -63 +63 @@
-        //Add values
-        sizes.put(QCIF,"QCIF");
-Q
+
-        //Return map
-        return sizes;
@@ -99 +99 @@
-        mosaics.put(MOSAIC2x2,"MOSAIC2x2");
-        mosaics.put(MOSAIC3x3,"MOSAIC3x3");
+        mosaics.put(MOSAIC3p4,"MOSAIC3+4");
+        mosaics.put(MOSAIC1p5,"MOSAIC1+5");
+        mosaics.put(MOSAIC1p5,"MOSAIC1+7");
-        //Return map
-        return mosaics;

mcuWeb/web/conference.jsp

@@ -12 +12 @@
-   
-%>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<fieldset style="width:48%;float:right">
-    <legend><img src="icons/application_view_tile.png"> Mosaic</legend>
@@ -74 +91 @@
-                <td>Composition:</td>
-                <td><select name="compType" value="<%=conf.getCompType()%>">
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    </select>
-                </td>
@@ -83 +110 @@
-                <td>Size</td>
-                <td><select name="size" value="<%=conf.getSize()%>">
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    </select>
-                </td>
@@ -99 +137 @@
-                            org.murillo.mcuWeb.Profile profile = itProf.next();
-                            //If it's the selected profile
-
-
-
-
-
+
-                        }
-                    %>