Commit c6ddb1bc authored by Dr. Michael Petter's avatar Dr. Michael Petter

latest changes

parent ba9c0be6
#!/bin/bash
xrandr --output eDP1 --mode 1360x720
xrandr --output eDP1 --mode 1360x720 --pos 0x0 --output HDMI2 --mode 1280x720 --pos 0x0
xrandr --output eDP-1 --mode 1024x768
xrandr --output eDP-1 --mode 1920x1080 --pos 0x0
xrandr --output HDMI-2 --mode 1280x720 --pos 0x0
xrandr --output HDMI-2 --scale-from 1920x1080 --pos 0x0
......@@ -74,8 +74,14 @@
<copy todir="${dist}"><fileset dir="${native}"></fileset></copy>
<copy todir="${dist}" file="run.sh" />
<copy todir="${dist}" file="beamer.sh" />
<copy todir="${dist}" file="beamer169.sh" />
<copy todir="${dist}" file="rotateTablet.sh" />
<copy todir="${dist}" file="rotatebackTablet.sh" />
<copy todir="${dist}" file="vncserver.sh" />
<copy todir="${dist}" file="vncserver169.sh" />
<copy todir="${dist}" file="touch-on.sh" />
<copy todir="${dist}" file="touch-off.sh" />
<copy todir="${dist}" file="run.sh" />
<zip destfile="./ttt.zip" basedir="." includes="dist/*" update="true"/>
</target>
......
......@@ -105,7 +105,7 @@ import ttt.record.LectureProfileDialog;
import ttt.record.Recording;
public class TTT extends JFrame {
static final String version = "12.10.2015";
static final String version = "23.05.2018";
public static boolean debug = !true;
public static boolean verbose = true;
......
......@@ -104,7 +104,7 @@ public class JSAAudioRecorder extends Thread implements IAudioRecorder {
public static String availableInputs(){
String ret="[";
for (Mixer.Info info: AudioSystem.getMixerInfo()){
TargetDataLine tdl = null;
TargetDataLine tdl = null;
for (int i = 0; i < audioFormats.length; i++) {
DataLine.Info in = new DataLine.Info(TargetDataLine.class, audioFormats[i]);
if (AudioSystem.isLineSupported(in)) {
......@@ -152,4 +152,4 @@ public class JSAAudioRecorder extends Thread implements IAudioRecorder {
targetDataLine.stop();
targetDataLine.close();
}
}
\ No newline at end of file
}
......@@ -287,7 +287,7 @@ public class TTTProcessor {
recording.setMessages(messages);
for(Message m : messages){
System.out.println("what's going on? " + Editor2.getStringFromTime( m.getTimestamp()) + " . damn " + m.toString());
//System.out.println("what's going on? " + Editor2.getStringFromTime( m.getTimestamp()) + " . damn " + m.toString());
}
......
......@@ -47,7 +47,7 @@ public class PodcastCreator {
private static final int RESOLUTION_WIDTH = 480;
private static final int RESOLUTION_HEIGTH = 320;
private static final String FFMPEG = "avconv";
private static final String FFMPEG = "ffmpeg";
private static final String MP4BOX = "MP4Box";
private static final double FRAMES_PER_SEC = 1;
......
......@@ -52,6 +52,7 @@ import ttt.ProtocolPreferences;
import ttt.TTT;
import ttt.audio.AudioVideoPlayer;
import ttt.audio.VolumeControl;
import ttt.messages.HextileMessage;
import ttt.gui.GraphicsContext;
import ttt.gui.Index;
import ttt.gui.IndexEntry;
......@@ -1116,7 +1117,8 @@ public class Recording extends MessageProducerAdapter implements Runnable,
******************************************************************************************************************/
public static void main(String[] args) {
// message_sizes(args);
color_histogram(args);
// color_histogram(args);
debug_recording(args);
}
public static void color_histogram(String[] args) {
......@@ -1173,4 +1175,34 @@ public class Recording extends MessageProducerAdapter implements Runnable,
}
System.exit(0);
}
public static void debug_recording(String[] args) {
TTT.verbose = false;
for (String arg : args) {
try {
Recording recording = new Recording(arg, false);
System.out.println("Recorded Desktop with dimensions: "+recording.prefs.framebufferWidth+"x"+recording.prefs.framebufferHeight);
System.out.println("# of recorded messages is "+recording.messages.size());
final int [] i= { 0 };
recording.messages.getMessages().stream()
.forEach(x -> {
System.out.print((++i[0]) +". message ("+x.getTimestamp()/1000.0+" secs): "+x.getClass()+" of size "+x.getSize());
if (x instanceof HextileMessage) {
HextileMessage m = (HextileMessage)x;
System.out.print(" = "+ m.getBounds().width+"x"+m.getBounds().height);
}
System.out.println();
});
System.out.println();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
System.exit(0);
}
}
......@@ -18,10 +18,10 @@ BrandingText " "
;Page directory
;Page instfiles
;steal most recent URLs from http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html
;steal most recent URLs from http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
!define JRE_VERSION "1.7"
!define JREX_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=81819"
!define JREI_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=81819"
!define JREX_URL "ttp://javadl.sun.com/webapps/download/AutoDL?BundleId=81821"
!define JREI_URL "http://download.oracle.com/otn-pub/java/jdk/8u152-b16/aa0333dd3019491ca4f6ddbe78cdb6d0/jdk-8u152-windows-i586.exe"
Var JRE_URL
Function .onInit
......
......@@ -15,9 +15,9 @@ cd ${PRG}
MACHINE_TYPE=`uname -m`
if [ ${MACHINE_TYPE} == 'x86_64' ]; then
echo Executing 64 bit version
LD_LIBRARY_PATH=linux64 java -Dsun.java2d.opengl=true -Xmx4096M -jar ttt.jar
LD_LIBRARY_PATH=linux64 java -Xmx4096M -jar ttt.jar
else
echo Executing 32 bit version
LD_LIBRARY_PATH=linux32 java -Dsun.java2d.opengl=true -Xmx1024M -jar ttt.jar
LD_LIBRARY_PATH=linux32 java -Xmx1024M -jar ttt.jar
fi
cd -
#!/bin/bash
xinput disable 16
input=`xinput | grep Digitizer | cut -f2 | cut -f2 -d=`
xinput disable $input
#!/bin/bash
xinput enable 16
input=`xinput | grep Digitizer | cut -f2 | cut -f2 -d=`
xinput enable $input
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