Skip to content

V
vlc-2-2
Commit 35947aed authored by Filippo Carone's avatar Filippo Carone
Browse files
Options

Makefile updated for new java bindings classes. 

copyright and svn:id fixed for new classes
parent 8e394d70
Show whitespace changes
Inline Side-by-side
Showing with 226 additions and 219 deletions
bindings/java/Makefile.am
View file @ 35947aed
...@@ -4,18 +4,19 @@ ...@@ -4,18 +4,19 @@
if BUILD_JAVA if BUILD_JAVA
OBJECTS = org/videolan/jvlc/JVLCNoSuchVariableNameException.class org/videolan/jvlc/JVLCBoolVariable.class org/videolan/jvlc/JVLCIntVariable.class org/videolan/jvlc/JVLCTimeVariable.class org/videolan/jvlc/JVLCVarValue.class org/videolan/jvlc/JVLCVariable.class org/videolan/jvlc/JVLCFloatVariable.class org/videolan/jvlc/JVLCStringVariable.class org/videolan/jvlc/JVLCVarVariable.class org/videolan/jvlc/JVLC.class org/videolan/jvlc/JVLCCanvas.class JVLCOBJECTS = org/videolan/jvlc/JVLCCanvas.class org/videolan/jvlc/JVLCPanel.class org/videolan/jvlc/AudioIntf.class org/videolan/jvlc/InputIntf.class org/videolan/jvlc/PlaylistIntf.class org/videolan/jvlc/VideoIntf.class org/videolan/jvlc/VLMIntf.class org/videolan/jvlc/Playlist.class org/videolan/jvlc/JLibVLC.class org/videolan/jvlc/JVLC.class org/videolan/jvlc/SWTVideoWidget.class
JNIHEADERS = org/videolan/jvlc/JVLCNoSuchVariableNameException.h org_videolan_jvlc_JVLCBoolVariable.h org_videolan_jvlc_JVLCFloatVariable.h org_videolan_jvlc_JVLC.h org_videolan_jvlc_JVLCIntVariable.h org_videolan_jvlc_JVLCStringVariable.h org_videolan_jvlc_JVLCTimeVariable.h org_videolan_jvlc_JVLCVariable.h org_videolan_jvlc_JVLCVarValue.h org_videolan_jvlc_JVLCVarVariable.h org_videolan_jvlc_JVLCCanvas.h JNIHEADERS = org_videolan_jvlc_JVLC.h org_videolan_jvlc_JVLCCanvas.h org_videolan_jvlc_JVLCPanel.h
# Include some JAVA stuff # Include some JAVA stuff
PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/'` PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/'`
JINCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux JINCLUDES = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
LIBJINCLUDES = -L$(JAVA_HOME)/jre/lib/$(PROCESSOR_FAMILY) -ljawt LIBJINCLUDES = -L$(JAVA_HOME)/jre/lib/$(PROCESSOR_FAMILY) -ljawt
SWT_PATH = /usr/share/java
# Binaries # Binaries
JCC = gcj -g JCC = gcj -g -I${SWT_PATH}/swt-gtk.jar
JCH = gcjh -jni JCH = gcjh -jni
# Compile flags # Compile flags
...@@ -25,14 +26,14 @@ JAVALDFLAGS = -L../../lib -lvlc_pic `top_builddir=../.. ../../vlc-config --libs ...@@ -25,14 +26,14 @@ JAVALDFLAGS = -L../../lib -lvlc_pic `top_builddir=../.. ../../vlc-config --libs
# Build targets # Build targets
all: libjvlc.so VlcClient all: libjvlc.so VlcClient
libjvlc.so: vlc-glue-jni.o vlc-graphics-jni.o libjvlc.so: vlc-libvlc-jni.o vlc-graphics-jni.o
$(CXX) -shared vlc-glue-jni.o vlc-graphics-jni.o $(LIBJINCLUDES) $(LDFLAGS) $(JAVALDFLAGS) -o libjvlc.so $(CXX) -shared vlc-libvlc-jni.o vlc-graphics-jni.o $(LIBJINCLUDES) $(LDFLAGS) $(JAVALDFLAGS) -o libjvlc.so
vlc-graphics-jni.o: VlcClient vlc-graphics-jni.o: VlcClient
$(CXX) -c vlc-graphics-jni.cc $(CXXFLAGS) $(JAVACXXFLAGS) $(CXX) -c vlc-graphics-jni.cc $(CXXFLAGS) $(JAVACXXFLAGS)
vlc-glue-jni.o: VlcClient vlc-libvlc-jni.o: VlcClient
$(CXX) -c vlc-glue-jni.cc $(CXXFLAGS) $(JAVACXXFLAGS) $(CXX) -c vlc-libvlc-jni.cc $(CXXFLAGS) $(JAVACXXFLAGS)
VlcClient: $(OBJECTS) VlcClient: $(OBJECTS)
$(JCC) -C VlcClient.java $(JCC) -C VlcClient.java
......
bindings/java/README
View file @ 35947aed
$Id$
First of all, this is a *developers* only version First of all, this is a *developers* only version
...@@ -35,4 +35,11 @@ java -Djava.library.path=. VlcClient ...@@ -35,4 +35,11 @@ java -Djava.library.path=. VlcClient
Be sure your ldconfig can find libjawt.so and libmawt.so or you will Be sure your ldconfig can find libjawt.so and libmawt.so or you will
get linking errors when you run the program. get linking errors when you run the program.
To try the SWT version of the player, issue:
javac -cp /usr/share/java/swt-gtk.jar:. SWTUglyPlayer.java
java -cp /usr/share/java/swt-gtk.jar:. -Djava.library.path=.:/usr/lib/jni SWTUglyPlayer
using the appropriate paths.
Happy playing. Happy playing.
bindings/java/org/videolan/jvlc/AudioIntf.java
View file @ 35947aed
/* /*****************************************************************************
* Created on 28-feb-2006 * AudioIntf.java: Audio methods interface
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* *
* $Id: AudioIntf.java 8 2006-02-28 12:03:47Z little $ * $Id$
* *
* This program is free software; you can redistribute it * Authors: Filippo Carone <filippo@carone.org>
* and/or modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is free software; you can redistribute it and/or modify
* WITHOUT ANY WARRANTY; without even the implied warranty of * it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * the Free Software Foundation; either version 2 of the License, or
* General Public License for more details. * (at your option) any later version.
* *
* You should have received a copy of the GNU General Public * This program is distributed in the hope that it will be useful,
* License along with this program; if not, write to the Free Software * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
*/ * You should have received a copy of the GNU General Public License
/** * along with this program; if not, write to the Free Software
* @author Filippo Carone <filippo@carone.org> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*/ *****************************************************************************/
package org.videolan.jvlc; package org.videolan.jvlc;
......
bindings/java/org/videolan/jvlc/InputIntf.java
View file @ 35947aed
/* /*****************************************************************************
* Created on 28-feb-2006 * InputIntf.java: Input interface
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* *
* $Id: InputIntf.java 8 2006-02-28 12:03:47Z little $ * $Id$
* *
* This program is free software; you can redistribute it * Authors: Filippo Carone <filippo@carone.org>
* and/or modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is free software; you can redistribute it and/or modify
* WITHOUT ANY WARRANTY; without even the implied warranty of * it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * the Free Software Foundation; either version 2 of the License, or
* General Public License for more details. * (at your option) any later version.
* *
* You should have received a copy of the GNU General Public * This program is distributed in the hope that it will be useful,
* License along with this program; if not, write to the Free Software * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
*/ * You should have received a copy of the GNU General Public License
/** * along with this program; if not, write to the Free Software
* @author Filippo Carone <filippo@carone.org> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*/ *****************************************************************************/
package org.videolan.jvlc; package org.videolan.jvlc;
......
bindings/java/org/videolan/jvlc/JLibVLC.java
View file @ 35947aed
/* /*****************************************************************************
* Created on 28-feb-2006 * JLibVLC.java: Main library interface
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* *
* $Id: JLibVLC.java 9 2006-02-28 18:30:52Z little $ * $Id$
* *
* This program is free software; you can redistribute it * Authors: Filippo Carone <filippo@carone.org>
* and/or modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is free software; you can redistribute it and/or modify
* WITHOUT ANY WARRANTY; without even the implied warranty of * it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * the Free Software Foundation; either version 2 of the License, or
* General Public License for more details. * (at your option) any later version.
* *
* You should have received a copy of the GNU General Public * This program is distributed in the hope that it will be useful,
* License along with this program; if not, write to the Free Software * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
*/ * You should have received a copy of the GNU General Public License
/** * along with this program; if not, write to the Free Software
* @author Filippo Carone <filippo@carone.org> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*/ *****************************************************************************/
package org.videolan.jvlc; package org.videolan.jvlc;
......
bindings/java/org/videolan/jvlc/JVLC.java
View file @ 35947aed
/* /*****************************************************************************
* Created on 28-feb-2006 * JVLC.java: Main Java Class, represents a libvlc_instance_t object
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* *
* $Id: JVLCPlayer.java 10 2006-02-28 19:07:17Z little $ * $Id$
* *
* This program is free software; you can redistribute it * Authors: Filippo Carone <filippo@carone.org>
* and/or modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is free software; you can redistribute it and/or modify
* WITHOUT ANY WARRANTY; without even the implied warranty of * it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * the Free Software Foundation; either version 2 of the License, or
* General Public License for more details. * (at your option) any later version.
* *
* You should have received a copy of the GNU General Public * This program is distributed in the hope that it will be useful,
* License along with this program; if not, write to the Free Software * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
*/ * You should have received a copy of the GNU General Public License
/** * along with this program; if not, write to the Free Software
* @author Filippo Carone <filippo@carone.org> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*/ *****************************************************************************/
package org.videolan.jvlc; package org.videolan.jvlc;
......
bindings/java/org/videolan/jvlc/JVLCCanvas.java
View file @ 35947aed
/* /*****************************************************************************
* Created on 25-nov-2005 * JVLCCanvas.java: AWT Canvas containing VLC Video Output
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* *
* $Id$
* *
* $Id: JVLCCanvas.java 11 2006-02-28 19:15:51Z little $ * Authors: Filippo Carone <filippo@carone.org>
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is free software; you can redistribute it and/or modify
* WITHOUT ANY WARRANTY; without even the implied warranty of * it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * the Free Software Foundation; either version 2 of the License, or
* General Public License for more details. * (at your option) any later version.
* *
* You should have received a copy of the GNU General Public * This program is distributed in the hope that it will be useful,
* License along with this program; if not, write to the Free Software * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
*/ * You should have received a copy of the GNU General Public License
/** * along with this program; if not, write to the Free Software
* @author Filippo Carone <filippo@carone.org> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*/ *****************************************************************************/
package org.videolan.jvlc; package org.videolan.jvlc;
......
bindings/java/org/videolan/jvlc/JVLCPanel.java
View file @ 35947aed
/* /*****************************************************************************
* Created on 28-nov-2005 * JVLCPanel.java: Java Swing JPanel embedding VLC Video Output
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* *
* $Id$
* *
* $Id: JVLCPanel.java 11 2006-02-28 19:15:51Z little $ * Authors: Filippo Carone <filippo@carone.org>
* *
* This program is free software; you can redistribute it * This program is free software; you can redistribute it and/or modify
* and/or modify it under the terms of the GNU General Public License * it under the terms of the GNU General Public License as published by
* as published by the Free Software Foundation; either version 2 of the * the Free Software Foundation; either version 2 of the License, or
* License, or (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful,
* WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public * You should have received a copy of the GNU General Public License
* License along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
* *****************************************************************************/
*/
/**
* @author Filippo Carone <filippo@carone.org>
*/
package org.videolan.jvlc; package org.videolan.jvlc;
......
bindings/java/org/videolan/jvlc/Playlist.java
View file @ 35947aed
/* /*****************************************************************************
* Created on 28-feb-2006 * Playlist.java: The playlist class
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* *
* $Id$ * $Id$
* *
* This program is free software; you can redistribute it * Authors: Filippo Carone <filippo@carone.org>
* and/or modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is free software; you can redistribute it and/or modify
* WITHOUT ANY WARRANTY; without even the implied warranty of * it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * the Free Software Foundation; either version 2 of the License, or
* General Public License for more details. * (at your option) any later version.
* *
* You should have received a copy of the GNU General Public * This program is distributed in the hope that it will be useful,
* License along with this program; if not, write to the Free Software * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
*/ * You should have received a copy of the GNU General Public License
/** * along with this program; if not, write to the Free Software
* @author Filippo Carone <filippo@carone.org> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*/ *****************************************************************************/
package org.videolan.jvlc; package org.videolan.jvlc;
......
bindings/java/org/videolan/jvlc/PlaylistIntf.java
View file @ 35947aed
/* /*****************************************************************************
* Created on 28-feb-2006 * PlaylistIntf.java: The playlist interface
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* *
* $Id: PlaylistIntf.java 10 2006-02-28 19:07:17Z little $ * $Id$
* *
* This program is free software; you can redistribute it * Authors: Filippo Carone <filippo@carone.org>
* and/or modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is free software; you can redistribute it and/or modify
* WITHOUT ANY WARRANTY; without even the implied warranty of * it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * the Free Software Foundation; either version 2 of the License, or
* General Public License for more details. * (at your option) any later version.
* *
* You should have received a copy of the GNU General Public * This program is distributed in the hope that it will be useful,
* License along with this program; if not, write to the Free Software * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
*/ * You should have received a copy of the GNU General Public License
/** * along with this program; if not, write to the Free Software
* @author Filippo Carone <filippo@carone.org> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*/ *****************************************************************************/
package org.videolan.jvlc; package org.videolan.jvlc;
......
bindings/java/org/videolan/jvlc/SWTVideoWidget.java
View file @ 35947aed
/* /*****************************************************************************
* Created on 31-mar-2006 * SWTVideoWidget.java: A component usable in SWT Application, embeds JVLC
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* *
* $Id $ * $Id$
* *
* This program is free software; you can redistribute it * Authors: Filippo Carone <filippo@carone.org>
* and/or modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is free software; you can redistribute it and/or modify
* WITHOUT ANY WARRANTY; without even the implied warranty of * it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * the Free Software Foundation; either version 2 of the License, or
* General Public License for more details. * (at your option) any later version.
* *
* You should have received a copy of the GNU General Public * This program is distributed in the hope that it will be useful,
* License along with this program; if not, write to the Free Software * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
*/ * You should have received a copy of the GNU General Public License
/** * along with this program; if not, write to the Free Software
* @author Filippo Carone <filippo@carone.org> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*/ *****************************************************************************/
package org.videolan.jvlc; package org.videolan.jvlc;
......
bindings/java/org/videolan/jvlc/VLMIntf.java
View file @ 35947aed
/* /*****************************************************************************
* Created on 28-feb-2006 * VLMIntf.java: VLM Interface
*****************************************************************************
* Copyright (C) 1998-2004 the VideoLAN team
* *
* $Id: VLMIntf.java 8 2006-02-28 12:03:47Z little $ * $Id$
* *
* This program is free software; you can redistribute it * Authors: Filippo Carone <filippo@carone.org>
* and/or modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, but * This program is free software; you can redistribute it and/or modify
* WITHOUT ANY WARRANTY; without even the implied warranty of * it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * the Free Software Foundation; either version 2 of the License, or
* General Public License for more details. * (at your option) any later version.
* *
* You should have received a copy of the GNU General Public * This program is distributed in the hope that it will be useful,
* License along with this program; if not, write to the Free Software * but WITHOUT ANY WARRANTY; without even the implied warranty of
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
*/ * You should have received a copy of the GNU General Public License
/** * along with this program; if not, write to the Free Software
* @author Filippo Carone <filippo@carone.org> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*/ *****************************************************************************/
package org.videolan.jvlc; package org.videolan.jvlc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment