Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Commit

Permalink
Version 2.0.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
peci1 committed Sep 17, 2016
0 parents commit b536aaa
Show file tree
Hide file tree
Showing 17 changed files with 12,331 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
StreamViewer.jar
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# 2.0.0 (2016-09-18) #

- The first version of peci1's fork.

- Added the Live stream viewer Java source code.
- The Live stream viewer can be used also with the camera connected to different than the "default" network interface.
- The Live stream viewer accepts two optional command-line parameters: `cameraIp` `cameraNetMaskBitSize` (specify either both or none).
- The Live stream viewer code has been refactored a bit and documented.
- The Live stream viewer is now distributed as a JAR archive and has an Ant buildfile.

- The Control.html/requests.html now accepts a URL parameter `ip` which designates the camera's IP address (you no longer need to edit the source code).
- If the `ip` parameter is not given in URL, the webpage asks for it in a Javascript prompt.
2 changes: 2 additions & 0 deletions Control.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
start Control.html
start java -jar StreamViewer.jar
7 changes: 7 additions & 0 deletions Control.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<html>
<FRAMESET rows="550,20,0">
<FRAME SRC="requests.html" name="requests">
<FRAME SRC="results.html" name="results">
<FRAME SRC="hidden.html" name="hidden">
</FRAMESET>
</html>
3 changes: 3 additions & 0 deletions StreamViewer/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nbproject/private
build
dist
11 changes: 11 additions & 0 deletions StreamViewer/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->

<project name="StreamViewer" default="default" basedir=".">
<description>Builds the project StreamViewer.</description>
<import file="nbproject/build-impl.xml"/>

<target depends="compile,jar" description="Build whole project" name="default" />
</project>
3 changes: 3 additions & 0 deletions StreamViewer/manifest.mf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build

1,413 changes: 1,413 additions & 0 deletions StreamViewer/nbproject/build-impl.xml

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions StreamViewer/nbproject/genfiles.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
build.xml.data.CRC32=31aaec44
build.xml.script.CRC32=8fdaf4b1
build.xml.stylesheet.CRC32=[email protected]
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=31aaec44
nbproject/build-impl.xml.script.CRC32=b0960498
nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
75 changes: 75 additions & 0 deletions StreamViewer/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=StreamViewer
application.vendor=Martin Pecka
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
build.dir=build
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket
debug.classpath=\
${run.classpath}
debug.test.classpath=\
${run.test.classpath}
# Files in build.classes.dir which should be excluded from distribution jar
dist.archive.excludes=
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/StreamViewer.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
includes=**
jar.compress=false
javac.classpath=
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.processorpath=\
${javac.classpath}
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
main.class=streamviewer.LumixStreamViewer
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
# Space-separated list of JVM arguments used when running the project.
# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
# To set system properties for unit tests define test-sys-prop.name=value:
run.jvmargs=
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
src.dir=src
test.src.dir=test
15 changes: 15 additions & 0 deletions StreamViewer/nbproject/project.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>StreamViewer</name>
<source-roots>
<root id="src.dir"/>
</source-roots>
<test-roots>
<root id="test.src.dir"/>
</test-roots>
</data>
</configuration>
</project>
Loading

0 comments on commit b536aaa

Please sign in to comment.