[Madsserv-commit] madsserv/src/client Client.java,1.15,1.16 ClientRTPManager.java,1.12,1.13

[<mar...@us...>]

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

Modified Files:
	Client.java ClientRTPManager.java 
Log Message:
Amelioration des transitions

Index: Client.java
===================================================================
RCS file: /cvsroot/madsserv/madsserv/src/client/Client.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Client.java	24 Mar 2003 15:34:52 -0000	1.15
--- Client.java	26 Mar 2003 01:03:41 -0000	1.16
***************
*** 124,129 ****
      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");
--- 124,129 ----
      this.setTitle("Madsserv Client");
      setAfficheStatusBar("Bienvenue");
!     URLChoice = new TextField("file:///c:\\temp\\lco.avi");
!     AdServer = new TextField("137.194.8.97:5200");
      menuFile.setLabel("File");
      menuOpenURL.setLabel("Open URL");
***************
*** 174,178 ****
  
      c.weightx = 0.0;
!     c.gridwidth = 2;
      panelSouth.add(statusBar, c);
  
--- 174,179 ----
  
      c.weightx = 0.0;
!     c.anchor = GridBagConstraints.WEST;
!    // c.gridwidth = 1;
      panelSouth.add(statusBar, c);
  
***************
*** 190,193 ****
--- 191,195 ----
      c.gridwidth = GridBagConstraints.RELATIVE;
      c.gridwidth = 1;
+     c.fill=GridBagConstraints.BOTH;
      c.weightx = 0.0;
      c.weighty = 1.0;
***************
*** 453,457 ****
  
    public void actionPerformed(ActionEvent evt) {
!     adaptee.boutongo_actionPerformed(evt);
    }
  }
--- 455,459 ----
  
    public void actionPerformed(ActionEvent evt) {
!     adaptee.boutonstop_actionPerformed(evt);
    }
  }

Index: ClientRTPManager.java
===================================================================
RCS file: /cvsroot/madsserv/madsserv/src/client/ClientRTPManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ClientRTPManager.java	24 Mar 2003 02:54:24 -0000	1.12
--- ClientRTPManager.java	26 Mar 2003 01:03:41 -0000	1.13
***************
*** 109,113 ****
              "javax.media.control.BufferControl");
          if (bc != null) {
!           bc.setBufferLength(10000);
  
          }
--- 109,113 ----
              "javax.media.control.BufferControl");
          if (bc != null) {
!           bc.setBufferLength(2000);
  
          }
***************
*** 375,415 ****
        myp.initialize();
  
- 
        //On synchronize ici la gestion du flux audio et du flux video
-       System.out.println("Passage dans RealizeComplete : " + players.size());
        Component vvc;
        if ( (players.size() > 1) && (compteur == 1)) {
          myq = (MyPlayer) players.elementAt(1 - i);
          if (myq.player.getState() == Player.Realized) {
-           System.err.println("Le player " + (1 - i) + " est realise");
            if ( (vvc = p.getVisualComponent()) != null) {
-             System.out.println("C'est de la video " + players.size());
              if (p.getState() == Player.Realized) {
                try {
                  p.addController(myq.player);
                  p.start();
                  client.setAfficheStatusBar("Diffusion en cours");
!                 addLog("playeur Video realise");
                }
                catch (Exception e) {
                  System.err.println("Incompatible Time Base 1");
                  client.showError("impossible de synchroniser les player");
!                 addLog("playeur Video pas realise");
                }
              }
            }
            else {
!             System.out.println("C'est de l'audio " + players.size());
              if (p.getState() == Player.Realized) {
                try {
                  myq.player.addController(p);
                  myq.player.start();
                  client.setAfficheStatusBar("Diffusion en cours");
!                 addLog("playeur Video realise");
                }
                catch (Exception e) {
                  System.err.println("Incompatible Time Base 2");
                  client.showError("impossible de synchroniser les player");
!                 addLog("playeur Video pas realise");
                }
              }
--- 375,413 ----
        myp.initialize();
  
        //On synchronize ici la gestion du flux audio et du flux video
        Component vvc;
        if ( (players.size() > 1) && (compteur == 1)) {
          myq = (MyPlayer) players.elementAt(1 - i);
          if (myq.player.getState() == Player.Realized) {
            if ( (vvc = p.getVisualComponent()) != null) {
              if (p.getState() == Player.Realized) {
                try {
+                 myq.player.setTimeBase(p.getTimeBase());
                  p.addController(myq.player);
                  p.start();
                  client.setAfficheStatusBar("Diffusion en cours");
!                 addLog("player Video realise");
                }
                catch (Exception e) {
                  System.err.println("Incompatible Time Base 1");
                  client.showError("impossible de synchroniser les player");
!                 addLog("player Video pas realise");
                }
              }
            }
            else {
! 
              if (p.getState() == Player.Realized) {
                try {
+                 p.setTimeBase(myq.player.getTimeBase());
                  myq.player.addController(p);
                  myq.player.start();
                  client.setAfficheStatusBar("Diffusion en cours");
!                 addLog("player Video realise");
                }
                catch (Exception e) {
                  System.err.println("Incompatible Time Base 2");
                  client.showError("impossible de synchroniser les player");
!                 addLog("player Video pas realise");
                }
              }
***************
*** 453,456 ****
--- 451,455 ----
  
    }
+ 
    /**
     * Retourne le temps actuel de lecture du media.
***************
*** 598,601 ****
--- 597,601 ----
  
      }
+ 
      /**
       * Initialise le MyPlayer