[Madsserv-commit] madsserv/src/server/streaming Streaming.java,1.6,1.7

[<car...@us...>]

Update of /cvsroot/madsserv/madsserv/src/server/streaming
In directory sc8-pr-cvs1:/tmp/cvs-serv16435/streaming

Modified Files:
	Streaming.java 
Log Message:
modifications des infos envoyees au client

Index: Streaming.java
===================================================================
RCS file: /cvsroot/madsserv/madsserv/src/server/streaming/Streaming.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Streaming.java	24 Mar 2003 02:54:25 -0000	1.6
--- Streaming.java	29 Mar 2003 22:03:35 -0000	1.7
***************
*** 171,181 ****
      updateStats.close();
  
-     /* alreadySent = 0;
-      for (int i = 0; i < sendStreamVectors.length; i++) {
-        for (int j = 0; j < sendStreamVectors[i].size(); j++) {
-          alreadySent += ( (SendStream) sendStreamVectors[i].elementAt(j)).
-              getSourceTransmissionStats().getBytesTransmitted();
-        }
-      }*/
      // Enregistrment du moment de suppression des anciens flux (utilise par le thread de calcul du debit)
      then = System.currentTimeMillis();
--- 171,174 ----
***************
*** 185,195 ****
        for (int i = 0; i < nbManagers; i++) {
          vectSize = sendStreamVectors[i].size();
-         System.err.println("Taille du vecteur sendStream " + i + " : " +
-                            vectSize);
          if (vectSize > 0) {
            for (int j = 0; j < vectSize; j++) {
              ( (SendStream) sendStreamVectors[i].get(j)).close();
              sendStreamVectors[i].remove(j);
-             System.err.println("suppression du sendstream " + i + "," + j);
            }
          }
--- 178,185 ----
***************
*** 215,219 ****
      // Envoi d'un message au client pour le prevenir de l'arrivee de nouveaux flux
      String[] messageToSend = new String[2];
!     messageToSend[0] = "Pret a envoyer le media";
      messageToSend[1] = String.valueOf(ss.length);
      addLog("Envoi du message : " + messageToSend[0]);
--- 205,209 ----
      // Envoi d'un message au client pour le prevenir de l'arrivee de nouveaux flux
      String[] messageToSend = new String[2];
!     messageToSend[0] = "Mise en tampon";
      messageToSend[1] = String.valueOf(ss.length);
      addLog("Envoi du message : " + messageToSend[0]);
***************
*** 284,294 ****
        for (int i = 0; i < nbManagers; i++) {
          vectSize = sendStreamVectors[i].size();
-         System.err.println("Taille du vecteur sendStream num" + i + " : " +
-                            vectSize);
          if (vectSize > 0) {
            for (int j = 0; j < vectSize; j++) {
              ( (SendStream) sendStreamVectors[i].get(j)).close();
              sendStreamVectors[i].remove(j);
-             System.err.println("suppression du sendstream " + i + "," + j);
            }
          }
--- 274,281 ----