[Madsserv-commit] madsserv/src/server DialogClient.java,1.4,1.5 ServerInit.java,1.5,1.6

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

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

Modified Files:
	DialogClient.java ServerInit.java 
Log Message:
premiere version test

Index: DialogClient.java
===================================================================
RCS file: /cvsroot/madsserv/madsserv/src/server/DialogClient.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DialogClient.java	13 Mar 2003 02:38:49 -0000	1.4
--- DialogClient.java	14 Mar 2003 03:26:18 -0000	1.5
***************
*** 70,74 ****
            System.out.println("Nouvelle URL pour le client " + clientID + ": " +
                               _message[1]);
! 
            serverInit.setPreferredFormat(clientID, _message[2]);
            System.out.println("Nouveau format prefere pour le client " +
--- 70,74 ----
            System.out.println("Nouvelle URL pour le client " + clientID + ": " +
                               _message[1]);
!           serverInit.createReencode(clientID, _message[1]);
            serverInit.setPreferredFormat(clientID, _message[2]);
            System.out.println("Nouveau format prefere pour le client " +

Index: ServerInit.java
===================================================================
RCS file: /cvsroot/madsserv/madsserv/src/server/ServerInit.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ServerInit.java	13 Mar 2003 02:38:49 -0000	1.5
--- ServerInit.java	14 Mar 2003 03:26:18 -0000	1.6
***************
*** 29,33 ****
  public class ServerInit {
  
!   ProcessorTest processor;
  
    // tabClients enregistre l'ensemble des clients connectes
--- 29,33 ----
  public class ServerInit {
  
! //  ProcessorTest processor;
  
    // tabClients enregistre l'ensemble des clients connectes
***************
*** 251,255 ****
      }
      if (inserted) {
!       tabClients[i - 1].setPortRTP(portBaseRTP + 2 * (i - 1));
        tabStreaming[i - 1] = new Streaming(i - 1, this);
        return (i - 1);
--- 251,255 ----
      }
      if (inserted) {
!       tabClients[i - 1].setPortRTP(portBaseRTP + 4 * (i - 1));
        tabStreaming[i - 1] = new Streaming(i - 1, this);
        return (i - 1);
***************
*** 267,271 ****
     * est deja atteint (creation d'un nouveau client impossible).
     */
!   public synchronized int createClient(String _IP, int _portBaseRTP,
                                         String _mediaAddress,
                                         String _preferredFormat,
--- 267,271 ----
     * est deja atteint (creation d'un nouveau client impossible).
     */
!  /* public synchronized int createClient(String _IP, int _portBaseRTP,
                                         String _mediaAddress,
                                         String _preferredFormat,
***************
*** 287,291 ****
        return ( -1);
      }
!   }
  
    /**
--- 287,291 ----
        return ( -1);
      }
!   }*/
  
    /**
***************
*** 308,311 ****
--- 308,320 ----
    }
  
+   public void createReencode(int _clientID, String _URL) {
+     if (tabReencode[_clientID] != null) {
+       tabReencode[_clientID].stop();
+       tabReencode[_clientID] = null;
+     }
+     tabReencode[_clientID] = new Reencode(_clientID, _URL);
+     //tabReencode[_clientID].start();
+   }
+ 
    /**
     * Demarre la diffusion du media demande pour un client donne.
***************
*** 324,336 ****
      }
      System.out.println("Le streaming est initialise");
!     processor = new ProcessorTest(new MediaLocator(getMediaAddress(_clientID)),
!                                   streamingTemp);
!     System.out.println("Le processor est cree");
      // D�marrage du ProcessorTest
!     processor.start();
      System.out.println("Le processeur a demarre");
  
      // On fournit la DataSource � diffuser
!     streamingTemp.setNewStreams(processor.getOutput());
      System.out.println("Le streaming a recu les nouveaux streams");
  
--- 333,347 ----
      }
      System.out.println("Le streaming est initialise");
!     //processor = new ProcessorTest(new MediaLocator(getMediaAddress(_clientID)),
!      //                             streamingTemp);
!   //  System.out.println("Le processor est cree");
      // D�marrage du ProcessorTest
! //    processor.start();
!     tabReencode[_clientID].setStreamingRef(streamingTemp);
!     tabReencode[_clientID].start();
      System.out.println("Le processeur a demarre");
  
      // On fournit la DataSource � diffuser
!     //streamingTemp.setNewStreams(processor.getOutput());
      System.out.println("Le streaming a recu les nouveaux streams");