Permalink
Browse files

Fixed debug in server, deprecated server INI file, cleaning up some o…

…ther stuff for new release
  • Loading branch information...
1 parent 8196403 commit aff429ac1da43335ecbc64a93b5d37caa84e7dfe daniel.shiffman committed Nov 14, 2010
@@ -3,6 +3,6 @@
<classpathentry kind="src" path=""/>
<classpathentry kind="lib" path="core.jar"/>
<classpathentry kind="lib" path="video.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.5.0 (MacOS X Default)"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path=""/>
</classpath>
@@ -15,8 +15,6 @@
import java.net.Socket;
import java.util.ArrayList;
-import mpe.config.FileParser;
-
public class WallServer {
private ArrayList<Connection> connections = new ArrayList<Connection>();
@@ -214,31 +212,7 @@ public static void main(String[] args) {
// see if info is given on the command line
for (int i = 0; i < args.length; i++) {
- if (args[i].contains("-ini")) {
- String iniFile = args[i].substring(4);
- FileParser fp = new FileParser(iniFile);
- if (fp.fileExists()) {
- int v = 0;
- v = fp.getIntValue("port");
- if (v > -1) port = v;
- v = fp.getIntValue("framerate");
- if (v > -1) framerate = v;
- v = fp.getIntValue("screens");
- if (v > -1) screens = v;
- v = fp.getIntValue("listener");
- if (v == 1) listener = true;
- v = fp.getIntValue("listenerPort");
- if (v > -1 && listener) {
- listenPort = v;
- }
- v = fp.getIntValue("debug");
- if (v == 1) mpePrefs.DEBUG = true;
- } else {
- out("ERROR: I can't open the " + iniFile + " INI file!");
- help = true;
- }
- }
- else if (args[i].contains("-screens")) {
+ if (args[i].contains("-screens")) {
args[i] = args[i].substring(8);
try{
screens = Integer.parseInt(args[i]);
@@ -293,7 +267,7 @@ else if (args[i].contains("-debug")) {
" * -screens<number of screens> Total # of expected clients. Defaults to 2\n" +
" * -framerate<framerate> Desired frame rate. Defaults to 30\n" +
" * -port<port number> Defines the port. Defaults to 9002\n" +
- " * -listen Turns on an optional port listener so that other apps can send data to the screens.\n" +
+ " * -listener Turns on an optional port listener so that other apps can send data to the screens.\n" +
" * -listenPort<port number> Defines listening port. Defaults to 9003.\n" +
" * -debug Turns debugging messages on.\n" +
" * -ini<INI file path.> Path to initialization file. Defaults to \"mpeServer.ini\".\n" +
@@ -11,7 +11,7 @@
public static int SCREENS = 2;
public static int FRAMERATE = 30;
- public static boolean DEBUG = true;
+ public static boolean DEBUG = false;
public static void setFramerate(int fr){
if (fr > -1) FRAMERATE = fr;
@@ -1,5 +0,0 @@
-screens=2;
-framerate=20;
-masterDimensions=640,240;
-listener=0;
-debug=0;
@@ -1,20 +0,0 @@
-#init file for MPE Server. Lines are semicolon delimited, and there should be
-#no spaces between characters.
-#
-#"screens" variable contains the total number of screens
-screens=2;
-#
-#"framerate" variable contains the global framerate of the screens
-framerate=20;
-#
-#"masterDimensions" is the total pixel dimensions of all the screens.
-masterDimensions=640,240;
-#
-#"listener" opens up a port listener so that other apps can sends data to the screens.
-#0=don't listen (default). 1=listen
-listener=0;
-#
-#"listenerPort" defines the listening port. It defaults to 9003.
-listenerPort=9003;
-#debug=1, will enable some printlns, 0 = false
-debug=1;

0 comments on commit aff429a

Please sign in to comment.