diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 20:05:55 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 20:05:55 +0000 |
| commit | fa2a23a730587d161a15f04dd4b3d75df2c76538 (patch) | |
| tree | 321e11e370598b6ccc5df498bed6c68e5090a281 | |
| parent | 9c9daf5f4344a70e2005712f082e778136bf9b1f (diff) | |
INTEGRATION: CWS presentationengine01 (1.1.1.1.12); FILE MERGED
2004/11/22 10:38:06 ka 1.1.1.1.12.1: added dispose call
| -rw-r--r-- | avmedia/source/java/Player.java | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/avmedia/source/java/Player.java b/avmedia/source/java/Player.java index 185c60782f1e..0c5ee7d8ebe1 100644 --- a/avmedia/source/java/Player.java +++ b/avmedia/source/java/Player.java @@ -70,7 +70,8 @@ import com.sun.star.media.*; public class Player implements javax.media.ControllerListener, com.sun.star.lang.XServiceInfo, - com.sun.star.media.XPlayer + com.sun.star.media.XPlayer, + com.sun.star.lang.XComponent { @@ -254,23 +255,14 @@ public class Player implements javax.media.ControllerListener, public synchronized com.sun.star.awt.Size getPreferredPlayerWindowSize() { java.awt.Component aVisualComponent = maPlayer.getVisualComponent(); - java.awt.Component aControlComponent = maPlayer.getControlPanelComponent(); com.sun.star.awt.Size aSize = new com.sun.star.awt.Size( 0, 0 ); if( aVisualComponent != null ) { java.awt.Dimension aDim = aVisualComponent.getPreferredSize(); - aSize.Width = Math.max( aDim.width, aSize.Width ); - aSize.Height += aDim.height; - } - - if( aControlComponent != null ) - { - java.awt.Dimension aDim = aControlComponent.getPreferredSize(); - - aSize.Width = Math.max( aDim.width, aSize.Width ); - aSize.Height += aDim.height; + aSize.Width = Math.max( aDim.width, 0 ); + aSize.Height = Math.max( aDim.height, 0 ); } return aSize; @@ -298,6 +290,32 @@ public class Player implements javax.media.ControllerListener, } } + // -------------- + // - XComponent - + // -------------- + + public synchronized void addEventListener( com.sun.star.lang.XEventListener xListener ) + { + } + + // ------------------------------------------------------------------------- + + public synchronized void removeEventListener( com.sun.star.lang.XEventListener xListener ) + { + } + + // ------------------------------------------------------------------------- + + public synchronized void dispose() + { + if( maPlayer != null ) + { + maPlayer.stop(); + maPlayer.close(); + maPlayer = null; + } + } + // ---------------- // - XServiceInfo - // ---------------- |