Skip to content

Commit

Permalink
Fixed debug in server, deprecated server INI file, cleaning up some o…
Browse files Browse the repository at this point in the history
…ther stuff for new release
  • Loading branch information
daniel.shiffman committed Nov 14, 2010
1 parent 8196403 commit aff429a
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 55 deletions.
2 changes: 1 addition & 1 deletion P5/MostPixelsEverTCP/.classpath
Expand Up @@ -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>
30 changes: 2 additions & 28 deletions P5/MostPixelsEverTCP/mpe/server/WallServer.java
Expand Up @@ -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>();
Expand Down Expand Up @@ -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]);
Expand Down Expand Up @@ -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" +
Expand Down
2 changes: 1 addition & 1 deletion P5/MostPixelsEverTCP/mpe/server/mpePrefs.java
Expand Up @@ -11,7 +11,7 @@ public class mpePrefs {
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;
Expand Down
5 changes: 0 additions & 5 deletions P5/MostPixelsEverTCP/mpeServer.ini

This file was deleted.

20 changes: 0 additions & 20 deletions P5/MostPixelsEverTCP/mpeServerComments.ini

This file was deleted.

0 comments on commit aff429a

Please sign in to comment.