Skip to content

Commit

Permalink
Added ivy.xml and build.xml, removed PortAudio* dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] committed Feb 18, 2011
1 parent 502f694 commit 4e3f15a
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 675 deletions.
58 changes: 58 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<project xmlns:ivy="antlib:org.apache.ivy.ant" name="daedalum" default="resolve">
<property file="build.properties" />

<property name="ivy.install.version" value="2.1.0-rc2" />
<condition property="ivy.home" value="${env.IVY_HOME}">
<isset property="env.IVY_HOME" />
</condition>
<property name="ivy.home" value="${user.home}/.ant" />
<property name="ivy.jar.dir" value="${ivy.home}/lib" />
<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />

<target name="download-ivy" unless="offline">
<mkdir dir="${ivy.jar.dir}" />
<!-- download Ivy from web site so that it can be used even without any special installation -->
<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.file}" usetimestamp="true" />
</target>

<target name="init-ivy" depends="download-ivy">
<!-- try to load ivy here from ivy home, in case the user has not already dropped
it into ant's lib dir (note that the latter copy will always take precedence).
We will not fail as long as local lib dir exists (it may be empty) and
ivy is in at least one of ant's lib dir or the local lib dir. -->
<path id="ivy.lib.path">
<fileset dir="${ivy.jar.dir}" includes="*.jar" />
</path>
<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path" />
</target>

<path id="clazzpath">
<fileset dir="lib" includes="*.jar" />
<pathelement location="bin" />
<fileset dir="${xuggle.jar.dir}" includes="xuggle-xuggler.jar">
</fileset>
</path>

<!-- =================================
target: resolve
================================= -->
<target name="resolve" description="--> retrieve dependencies with ivy" depends="init-ivy">
<ivy:retrieve />
</target>

<target name="build" description="Build the project" depends="resolve">
<mkdir dir="bin" />
<javac srcdir="src" destdir="bin" classpathref="clazzpath" />
</target>

<target name="run" description="Launch a sample media player" depends="build">
<java fork="true" classname="com.stainlesscode.mediaplayer.MediaPlayer" classpathref="clazzpath">
<sysproperty key="java.library.path" value="${xuggle.home}/lib" />
</java>
</target>

<target name="clean" description="Clean the project">
<delete dir="lib" />
<delete dir="bin" />
</target>
</project>
12 changes: 12 additions & 0 deletions ivy.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<ivy-module version="2.0">
<info organisation="org.apache" module="hello-ivy" />
<dependencies>
<dependency org="commons-collections" name="commons-collections"
rev="3.2.1" />
<dependency org="commons-pool" name="commons-pool" rev="1.5.4" />
<dependency org="log4j" name="log4j" rev="1.2.16" />
<dependency org="org.slf4j" name="slf4j-api" rev="1.6.0"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.0"/>
<dependency org="net.sf.trove4j" name="trove4j" rev="2.0.2" />
</dependencies>
</ivy-module>
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,10 @@ public void close() {

}

@Override
public long getLastPts() {
// TODO Auto-generated method stub
return 0;
}

}
179 changes: 0 additions & 179 deletions src/com/stainlesscode/mediapipeline/audioout/PortAudioDriver.java

This file was deleted.

126 changes: 0 additions & 126 deletions src/com/stainlesscode/mediapipeline/audioout2/AudioWriterThread.java

This file was deleted.

Loading

0 comments on commit 4e3f15a

Please sign in to comment.