Index: org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java

===================================================================

--- org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java	(revision 11644)

+++ org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java	(working copy)

@@ -1,92 +0,0 @@

-/**

- * $RCSfile: TestMediaSession.java,v $

- * $Revision: 1.1 $

- * $Date: 08/11/2006

- * <p/>

- * Copyright 2003-2006 Jive Software.

- * <p/>

- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * <p/>

- * http://www.apache.org/licenses/LICENSE-2.0

- * <p/>

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-package org.jivesoftware.smackx.jingle.mediaimpl.test;

-

-import org.jivesoftware.smackx.jingle.JingleSession;

-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;

-import org.jivesoftware.smackx.jingle.media.PayloadType;

-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;

-

-/**

- * This Class implements a complete JingleMediaSession for unit testing.

- *

- * @author Thiago Camargo

- */

-public class TestMediaSession extends JingleMediaSession {

-

-     /**

-     * Creates a TestMediaSession with defined payload type, remote and local candidates

-     *

-     * @param payloadType Payload of the jmf

-     * @param remote      the remote information. The candidate that the jmf will be sent to.

-     * @param local       the local information. The candidate that will receive the jmf

-     * @param locator     media locator

-     */

-    public TestMediaSession(final PayloadType payloadType, final TransportCandidate remote, final TransportCandidate local,

-            final String locator, JingleSession jingleSession) {

-        super(payloadType, remote, local, "Test", jingleSession);

-        initialize();

-    }

-

-    /**

-     * Initialize the screen share channels.

-     */

-    public void initialize() {

-

-    }

-

-    /**

-     * Starts transmission and for NAT Traversal reasons start receiving also.

-     */

-    public void startTrasmit() {

-        

-    }

-

-    /**

-     * Set transmit activity. If the active is true, the instance should trasmit.

-     * If it is set to false, the instance should pause transmit.

-     *

-     * @param active active state

-     */

-    public void setTrasmit(boolean active) {

-        

-    }

-

-    /**

-     * For NAT Reasons this method does nothing. Use startTransmit() to start transmit and receive jmf

-     */

-    public void startReceive() {

-        // Do nothing

-    }

-

-    /**

-     * Stops transmission and for NAT Traversal reasons stop receiving also.

-     */

-    public void stopTrasmit() {

-       

-    }

-

-    /**

-     * For NAT Reasons this method does nothing. Use startTransmit() to start transmit and receive jmf

-     */

-    public void stopReceive() {

-       

-    }

-}

Index: org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java

===================================================================

--- org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java	(revision 11644)

+++ org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java	(working copy)

@@ -1,93 +0,0 @@

-/**

- * $RCSfile: TestMediaManager.java,v $

- * $Revision: 1.3 $

- * $Date: 25/12/2006

- * <p/>

- * Copyright 2003-2006 Jive Software.

- * <p/>

- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * <p/>

- * http://www.apache.org/licenses/LICENSE-2.0

- * <p/>

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-package org.jivesoftware.smackx.jingle.mediaimpl.test;

-

-import org.jivesoftware.smackx.jingle.media.JingleMediaManager;

-import org.jivesoftware.smackx.jingle.media.JingleMediaSession;

-import org.jivesoftware.smackx.jingle.media.PayloadType;

-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;

-import org.jivesoftware.smackx.jingle.nat.TransportCandidate;

-import org.jivesoftware.smackx.jingle.JingleSession;

-

-import java.util.*;

-

-/**

- * Implements a MediaManager for test purposes.

- *

- * @author Thiago Camargo

- */

-

-public class TestMediaManager extends JingleMediaManager {

-

-    public static final String MEDIA_NAME = "TestMedia";

-

-    private List<PayloadType> payloads = new ArrayList<PayloadType>();

-

-    private PayloadType preferredPayloadType = null;

-

-    public TestMediaManager(JingleTransportManager transportManager) {

-        super(transportManager);

-    }

-

-    /**

-    * Return all supported Payloads for this Manager.

-    *

-    * @return The Payload List

-    */

-    public List<PayloadType> getPayloads() {

-        return payloads;

-    }

-

-    public void setPayloads(List<PayloadType> payloads) {

-        this.payloads.addAll(payloads);

-    }

-

-    /**

-     * Returns a new JingleMediaSession

-     *

-     * @param payloadType payloadType

-     * @param remote      remote Candidate

-     * @param local       local Candidate

-     * @return JingleMediaSession JingleMediaSession

-     */

-    public JingleMediaSession createMediaSession(PayloadType payloadType, final TransportCandidate remote,

-            final TransportCandidate local, final JingleSession jingleSession) {

-        TestMediaSession session = null;

-

-        session = new TestMediaSession(payloadType, remote, local, "", jingleSession);

-

-        return session;

-    }

-

-    public PayloadType getPreferredPayloadType() {

-        if (preferredPayloadType != null)

-            return preferredPayloadType;

-        return super.getPreferredPayloadType();

-    }

-

-    public void setPreferredPayloadType(PayloadType preferredPayloadType) {

-        this.preferredPayloadType = preferredPayloadType;

-    }

-

-    public String getName() {

-        return MEDIA_NAME;

-    }

-}

Index: org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java

===================================================================

--- org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java	(revision 11644)

+++ org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java	(working copy)

@@ -1,282 +0,0 @@

-package org.jivesoftware.smackx.jingle.mediaimpl;

-

-import java.awt.Frame;

-import java.awt.TextArea;

-import java.awt.Toolkit;

-import java.util.Vector;

-

-import javax.media.Format;

-import javax.media.PlugInManager;

-import javax.media.Renderer;

-import javax.media.format.AudioFormat;

-

-import org.jivesoftware.smackx.jingle.SmackLogger;

-

-import com.sun.media.ExclusiveUse;

-import com.sun.media.util.Registry;

-

-public class JMFInit extends Frame implements Runnable {

-

-	private static final SmackLogger LOGGER = SmackLogger.getLogger(JMFInit.class);

-

-	private String tempDir = "/tmp";

-

-    private boolean done = false;

-

-    private String userHome;

-

-    private boolean visible = false;

-

-    public JMFInit(String[] args, boolean visible) {

-        super("Initializing JMF...");

-

-        this.visible = visible;

-

-        Registry.set("secure.allowCaptureFromApplets", true);

-        Registry.set("secure.allowSaveFileFromApplets", true);

-

-        updateTemp(args);

-

-        try {

-            Registry.commit();

-        }

-        catch (Exception e) {

-

-            message("Failed to commit to JMFRegistry!");

-        }

-

-        Thread detectThread = new Thread(this);

-        detectThread.run();

-

-        /*

-           * int slept = 0; while (!done && slept < 60 * 1000 * 2) { try {

-           * Thread.currentThread().sleep(500); } catch (InterruptedException ie) { }

-           * slept += 500; }

-           *

-           * if (!done) { console.error("Detection is taking too long!

-           * Aborting!"); message("Detection is taking too long! Aborting!"); }

-           *

-           * try { Thread.currentThread().sleep(2000); } catch

-           * (InterruptedException ie) { }

-           */

-    }

-

-    public void run() {

-        detectDirectAudio();

-        detectS8DirectAudio();

-        detectCaptureDevices();

-        done = true;

-    }

-

-    private void updateTemp(String[] args) {

-        if (args != null && args.length > 0) {

-            tempDir = args[0];

-

-            message("Setting cache directory to " + tempDir);

-            Registry r = new Registry();

-            try {

-                r.set("secure.cacheDir", tempDir);

-                r.commit();

-

-                message("Updated registry");

-            }

-            catch (Exception e) {

-                message("Couldn't update registry!");

-            }

-        }

-    }

-

-    private void detectCaptureDevices() {

-        // check if JavaSound capture is available

-        message("Looking for Audio capturer");

-        Class dsauto;

-        try {

-            dsauto = Class.forName("DirectSoundAuto");

-            dsauto.newInstance();

-            message("Finished detecting DirectSound capturer");

-        }

-        catch (ThreadDeath td) {

-            throw td;

-        }

-        catch (Throwable t) {

-            //Do nothing

-        }

-

-        Class jsauto;

-        try {

-            jsauto = Class.forName("JavaSoundAuto");

-            jsauto.newInstance();

-            message("Finished detecting javasound capturer");

-        }

-        catch (ThreadDeath td) {

-            throw td;

-        }

-        catch (Throwable t) {

-            message("JavaSound capturer detection failed!");

-        }

-

-        /*

-        // Check if VFWAuto or SunVideoAuto is available

-        message("Looking for video capture devices");

-        Class auto = null;

-        Class autoPlus = null;

-        try {

-            auto = Class.forName("VFWAuto");

-        }

-        catch (Exception e) {

-        }

-        if (auto == null) {

-            try {

-                auto = Class.forName("SunVideoAuto");

-            }

-            catch (Exception ee) {

-

-            }

-            try {

-                autoPlus = Class.forName("SunVideoPlusAuto");

-            }

-            catch (Exception ee) {

-

-            }

-        }

-        if (auto == null) {

-            try {

-                auto = Class.forName("V4LAuto");

-            }

-            catch (Exception ee) {

-

-            }

-        }

-        try {

-            Object instance = auto.newInstance();

-            if (autoPlus != null) {

-                Object instancePlus = autoPlus.newInstance();

-            }

-

-            message("Finished detecting video capture devices");

-        }

-        catch (ThreadDeath td) {

-            throw td;

-        }

-        catch (Throwable t) {

-

-            message("Capture device detection failed!");

-        }

-        */

-    }

-

-    private void detectDirectAudio() {

-        Class cls;

-        int plType = PlugInManager.RENDERER;

-        String dar = "com.sun.media.renderer.audio.DirectAudioRenderer";

-        try {

-            // Check if this is the Windows Performance Pack - hack

-            cls = Class.forName("VFWAuto");

-            // Check if DS capture is supported, otherwise fail DS renderer

-            // since NT doesn't have capture

-            cls = Class.forName("com.sun.media.protocol.dsound.DSound");

-            // Find the renderer class and instantiate it.

-            cls = Class.forName(dar);

-

-            Renderer rend = (Renderer) cls.newInstance();

-            try {

-                // Set the format and open the device

-                AudioFormat af = new AudioFormat(AudioFormat.LINEAR, 44100, 16,

-                        2);

-                rend.setInputFormat(af);

-                rend.open();

-                Format[] inputFormats = rend.getSupportedInputFormats();

-                // Register the device

-                PlugInManager.addPlugIn(dar, inputFormats, new Format[0],

-                        plType);

-                // Move it to the top of the list

-                Vector rendList = PlugInManager.getPlugInList(null, null,

-                        plType);

-                int listSize = rendList.size();

-                if (rendList.elementAt(listSize - 1).equals(dar)) {

-                    rendList.removeElementAt(listSize - 1);

-                    rendList.insertElementAt(dar, 0);

-                    PlugInManager.setPlugInList(rendList, plType);

-                    PlugInManager.commit();

-                    // Log.debug("registered");

-                }

-                rend.close();

-            }

-            catch (Throwable t) {

-                // Log.debug("Error " + t);

-            }

-        }

-        catch (Throwable tt) {

-            //Do nothing

-        }

-    }

-

-    private void detectS8DirectAudio() {

-        Class cls;

-        int plType = PlugInManager.RENDERER;

-        String dar = "com.sun.media.renderer.audio.DirectAudioRenderer";

-        try {

-            // Check if this is the solaris Performance Pack - hack

-            cls = Class.forName("SunVideoAuto");

-

-            // Find the renderer class and instantiate it.

-            cls = Class.forName(dar);

-

-            Renderer rend = (Renderer) cls.newInstance();

-

-            if (rend instanceof ExclusiveUse

-                    && !((ExclusiveUse) rend).isExclusive()) {

-                // sol8+, DAR supports mixing

-                Vector rendList = PlugInManager.getPlugInList(null, null,

-                        plType);

-                int listSize = rendList.size();

-                boolean found = false;

-                String rname = null;

-

-                for (int i = 0; i < listSize; i++) {

-                    rname = (String) (rendList.elementAt(i));

-                    if (rname.equals(dar)) { // DAR is in the registry

-                        found = true;

-                        rendList.removeElementAt(i);

-                        break;

-                    }

-                }

-

-                if (found) {

-                    rendList.insertElementAt(dar, 0);

-                    PlugInManager.setPlugInList(rendList, plType);

-                    PlugInManager.commit();

-                }

-            }

-        }

-        catch (Throwable tt) {

-            //Do nothing

-        }

-    }

-

-    private void message(String mesg) {

-        LOGGER.debug(mesg);

-    }

-

-    private void createGUI() {

-        TextArea textBox = new TextArea(5, 50);

-        add("Center", textBox);

-        textBox.setEditable(false);

-        addNotify();

-        pack();

-

-        int scrWidth = (int) Toolkit.getDefaultToolkit().getScreenSize()

-                .getWidth();

-        int scrHeight = (int) Toolkit.getDefaultToolkit().getScreenSize()

-                .getHeight();

-

-        setLocation((scrWidth - getWidth()) / 2, (scrHeight - getHeight()) / 2);

-

-        setVisible(visible);

-

-    }

-

-    public static void start(boolean visible) {

-        new JMFInit(null, visible);

-    }

-}

Index: org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java

===================================================================

--- org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java	(revision 11644)

+++ org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java	(working copy)

@@ -1,174 +0,0 @@

-/**

- * $RCSfile: Demo.java,v $

- * $Revision: 1.3 $

- * $Date: 28/12/2006

- * <p/>

- * Copyright 2003-2006 Jive Software.

- * <p/>

- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * <p/>

- * http://www.apache.org/licenses/LICENSE-2.0

- * <p/>

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-package org.jivesoftware.smackx.jingle.mediaimpl.demo;

-

-import org.jivesoftware.smack.Connection;

-import org.jivesoftware.smack.XMPPConnection;

-import org.jivesoftware.smack.XMPPException;

-import org.jivesoftware.smackx.jingle.JingleManager;

-import org.jivesoftware.smackx.jingle.JingleSession;

-import org.jivesoftware.smackx.jingle.JingleSessionRequest;

-import org.jivesoftware.smackx.jingle.listeners.JingleSessionRequestListener;

-import org.jivesoftware.smackx.jingle.media.JingleMediaManager;

-import org.jivesoftware.smackx.jingle.mediaimpl.jspeex.SpeexMediaManager;

-import org.jivesoftware.smackx.jingle.mediaimpl.sshare.ScreenShareMediaManager;

-import org.jivesoftware.smackx.jingle.nat.ICETransportManager;

-import org.jivesoftware.smackx.jingle.nat.JingleTransportManager;

-

-import javax.swing.*;

-import java.awt.event.ActionEvent;

-import java.util.ArrayList;

-import java.util.List;

-

-/**

- * Jingle Demo Application. It register in a XMPP Server and let users place calls using a full JID and auto-receive calls.

- * Parameters: Server User Pass.