[Madsserv-commit] madsserv/src/client Client.java,1.12,1.13 ClientRTPManager.java,1.10,1.11 PlayerPanel.java,1.9,1.10

[<dep...@us...>]

Update of /cvsroot/madsserv/madsserv/src/client
In directory sc8-pr-cvs1:/tmp/cvs-serv11683

Modified Files:
	Client.java ClientRTPManager.java PlayerPanel.java 
Log Message:
le serveur avec les bons commentaires

Index: Client.java
===================================================================
RCS file: /cvsroot/madsserv/madsserv/src/client/Client.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Client.java	21 Mar 2003 02:36:40 -0000	1.12
--- Client.java	23 Mar 2003 22:53:13 -0000	1.13
***************
*** 56,60 ****
  
    /**
!    *  Contructeur de la Classe Client
     */
  
--- 56,60 ----
  
    /**
!    *  Contructeur de la Classe Client, lance l'interface graphique
     */
  
***************
*** 99,103 ****
        insVideo = true;
      }
!     // on regarde si la video est deja insere ou non
      else if (!insVideo) {
        playerPanel = pp;
--- 99,103 ----
        insVideo = true;
      }
!     // dans le cas audio on regarde si la video est deja insere ou non
      else if (!insVideo) {
        playerPanel = pp;
***************
*** 119,124 ****
      this.setTitle("Madsserv Client");
      setAfficheStatusBar("Bienvenue");
!     URLChoice = new TextField("file:///c:\\temp\\lco.avi");
!     AdServer = new TextField("dronej.rezel.com:5200");
      menuFile.setLabel("File");
      menuOpenURL.setLabel("Open URL");
--- 119,124 ----
      this.setTitle("Madsserv Client");
      setAfficheStatusBar("Bienvenue");
!     URLChoice = new TextField("file:///e:\\jmf\\lco.avi");
!     AdServer = new TextField("137.194.132.36:5200");
      menuFile.setLabel("File");
      menuOpenURL.setLabel("Open URL");
***************
*** 238,241 ****
--- 238,242 ----
      String[] messageToSend;
  
+     //on regarde si le socket existe deja ou non
      if (mySocket == null) {
        try {
***************
*** 250,253 ****
--- 251,255 ----
      }
  
+     //dans le cas ou le socket existe c'est une demande de changement de fichier
      else {
        messageToSend = new String[1];
***************
*** 261,265 ****
  
    /**
!    * Arrete le module DialogServer et met l'objet a null, met l'objet mySocket a null
     */
    public void endConnexion() {
--- 263,267 ----
  
    /**
!    * Arrete l'objet dialogServer et met l'objet a null, met l'objet mySocket a null
     */
    public void endConnexion() {

Index: ClientRTPManager.java
===================================================================
RCS file: /cvsroot/madsserv/madsserv/src/client/ClientRTPManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ClientRTPManager.java	21 Mar 2003 02:36:40 -0000	1.10
--- ClientRTPManager.java	23 Mar 2003 22:53:13 -0000	1.11
***************
*** 90,94 ****
          if (ipAddr.isMulticastAddress()) {
  
-           // local and remote address pairs are identical:
            localAddr = new SessionAddress(ipAddr,
                                           session.port,
--- 90,93 ----
***************
*** 124,128 ****
  
      long then = System.currentTimeMillis();
!     long waitingPeriod = 30000; // wait for a maximum of 30 secs.
  
      try {
--- 123,127 ----
  
      long then = System.currentTimeMillis();
!     long waitingPeriod = 30000; // attente maximum de 30 secondes
  
      try {
***************
*** 258,263 ****
  
      RTPManager mgr = (RTPManager) evt.getSource();
!     Participant participant = evt.getParticipant(); // could be null.
!     ReceiveStream stream = evt.getReceiveStream(); // could be null.
  
      if (evt instanceof RemotePayloadChangeEvent) {
--- 257,262 ----
  
      RTPManager mgr = (RTPManager) evt.getSource();
!     Participant participant = evt.getParticipant(); // peut etre nulle
!     ReceiveStream stream = evt.getReceiveStream(); // peut etre nulle
  
      if (evt instanceof RemotePayloadChangeEvent) {
***************
*** 275,279 ****
          DataSource ds = stream.getDataSource();
  
!         // Find out the formats.
          RTPControl ctl = (RTPControl) ds.getControl(
              "javax.media.rtp.RTPControl");
--- 274,278 ----
          DataSource ds = stream.getDataSource();
  
!         // trouve les formats
          RTPControl ctl = (RTPControl) ds.getControl(
              "javax.media.rtp.RTPControl");
***************
*** 363,367 ****
      }
  
!     // Get this when the internal players are realized.
      if (ce instanceof RealizeCompleteEvent) {
        MyPlayer myp = find(p);
--- 362,366 ----
      }
  
!     // On passe par ici lorsque les player sont realises
      if (ce instanceof RealizeCompleteEvent) {
        MyPlayer myp = find(p);
***************
*** 369,378 ****
        i = findIntPlayer(p);
        if (myp == null) {
-         // Some strange happened.
          System.err.println("Internal error!");
          System.exit( -1);
        }
        myp.initialize();
-       // p.start();
  
  
--- 368,375 ----
***************
*** 504,508 ****
            session = session.substring(1);
  
!           // Now see if there's a addr specified.
          }
          off = session.indexOf('/');
--- 501,505 ----
            session = session.substring(1);
  
!           // on regarde si une adresse est bien specifie
          }
          off = session.indexOf('/');
***************
*** 515,519 ****
            addr = session.substring(0, off);
            session = session.substring(off + 1);
!           // Now see if there's a port specified
            off = session.indexOf('/');
            if (off == -1) {
--- 512,516 ----
            addr = session.substring(0, off);
            session = session.substring(off + 1);
!           // on regarde si un port est bien specifie
            off = session.indexOf('/');
            if (off == -1) {
***************
*** 525,529 ****
              portStr = session.substring(0, off);
              session = session.substring(off + 1);
!             // Now see if there's a ttl specified
              off = session.indexOf('/');
              if (off == -1) {
--- 522,526 ----
              portStr = session.substring(0, off);
              session = session.substring(off + 1);
!             // on regarde si un ttl est specifie
              off = session.indexOf('/');
              if (off == -1) {

Index: PlayerPanel.java
===================================================================
RCS file: /cvsroot/madsserv/madsserv/src/client/PlayerPanel.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PlayerPanel.java	21 Mar 2003 02:36:42 -0000	1.9
--- PlayerPanel.java	23 Mar 2003 22:53:13 -0000	1.10
***************
*** 6,19 ****
  
  import javax.media.*;
! /*import javax.media.rtp.*;
! import javax.media.rtp.event.*;
! import javax.media.rtp.rtcp.*;
! import javax.media.protocol.*;
! import javax.media.protocol.DataSource;
! import javax.media.format.AudioFormat;
! import javax.media.format.VideoFormat;
! import javax.media.Format;
! import javax.media.format.FormatChangeEvent;
! import javax.media.control.BufferControl;*/
  
  /**
--- 6,10 ----
  
  import javax.media.*;
! 
  
  /**