Merge pull request #15 from MrExplode/timecode-issues

Removed not correct code

Author: cansik

src/main/java/ch/bildspur/artnet/packets/ArtTimePacket.java

@@ -14,8 +14,6 @@ public class ArtTimePacket extends ArtNetPacket {
     private int hours;
     private int type;
 
-    public long encoded;
-    
     public ArtTimePacket() {
         super(PacketType.ART_TIMECODE);
         setData(new byte[19]);
@@ -32,133 +30,21 @@ public boolean parse(byte[] raw) {
         minutes = data.getInt8(16);
         hours = data.getInt8(17);
         type = data.getInt8(18);
-        encoded = encode(hours, minutes, seconds, frames, type);
         return true;
     }
 
     /**
-     * Increment the timecode by 1.
+     * Set the time in one method.
+     * @param hour hours
+     * @param min minutes
+     * @param sec seconds
+     * @param frame frames
      */
-    public void increment() {
-        encoded++;
-        int[] val = decode(encoded, type);
-        frames = val[3];
-        seconds = val[2];
-        minutes = val[1];
-        hours = val[0];
-        updateData();
-    }
-    
-    /**
-     * Decrement the timecode by 1;
-     */
-    public void decrement() {
-        encoded--;
-        int[] val = decode(encoded, type);
-        frames = val[3];
-        seconds = val[2];
-        minutes = val[1];
-        hours = val[0];
-        updateData();
-    }
-    
-    /**
-     * Convert the separate values into one long value, for easy increment/decrement
-     * 
-     * @param hour number of hours
-     * @param min number of minutes
-     * @param sec number of seconds
-     * @param frame number of frames
-     * @param frameType the type of the timecode
-     * @return the encoded time value
-     */
-    public long encode(int hour, int min, int sec, int frame, int frameType) {
-        int framerate = 30;
-        switch (frameType) {
-            case 0:
-            	//film
-                framerate = 24;
-                break;
-            case 1:
-            	//ebu
-                framerate = 25;
-                break;
-            case 2:
-            	//df
-                throw new IllegalArgumentException("DF type not implemented! Do you wanna implement it yourself?");
-            case 3:
-            	//smtpe
-                framerate = 30;
-                break;
-            default:
-                framerate = 30;
-                break;
-        }
-        
-        int hour_fr = hour * 60 * 60 * framerate;
-        int min_fr = min * 60 * framerate;
-        int sec_fr = sec * framerate;
-        
-        return hour_fr + min_fr + sec_fr + frame;
-    }
-    
-    /**
-     * Decodes the encoded timecode value.<br>
-     * Elements of the returning int array:<br>
-     * 0: hour<br>
-     * 1: minute<br>
-     * 2: second<br>
-     * 3: frame<br>
-     * 
-     * @param frames the encoded time data
-     * @param frameType the type of the timecode
-     * @return the decoded time values
-     */
-    public int[] decode(long frames, int frameType) {
-        int framerate = 30;
-        switch (frameType) {
-            case 0:
-                framerate = 24;
-                break;
-            case 1:
-                framerate = 25;
-                break;
-            case 2:
-                throw new IllegalArgumentException("DF type not implemented! Do you wanna implement it yourself?");
-            case 3:
-                framerate = 30;
-                break;
-            default:
-                framerate = 30;
-                break;
-        }
-        
-        int[] dec = new int[4];
-        
-        int hour = ((int) frames / 60 / 60 / framerate);
-        frames = frames - (hour * 60 * 60 * framerate);
-        dec[0] = hour;
-        
-        int min = ((int) frames / 60 / framerate);
-        frames = frames - (min * 60 * framerate);
-        dec[1] = min;
-        
-        int sec = ((int) frames / framerate);
-        frames = frames - (sec * framerate);
-        dec[2] = sec;
-        
-        int frame = (int) frames;
-        dec[3] = frame;
-        
-        return dec;
-    }
-    
     public void setTime(int hour, int min, int sec, int frame) {
     	this.hours = hour;
     	this.minutes = min;
     	this.seconds = sec;
     	this.frames = frame;
-    	this.encoded = encode(hours, minutes, seconds, frames, type);
     	updateData();
     }
 
@@ -171,8 +57,7 @@ public int getFrames() {
 
 
     public void setFrames(int frames) {
-        this.frames = frames & 0x0f;
-        this.encoded = encode(hours, minutes, seconds, this.frames, type);
+        this.frames = frames;
         updateData();
     }
 
@@ -186,7 +71,6 @@ public int getSeconds() {
 
     public void setSeconds(int seconds) {
         this.seconds = seconds;
-        this.encoded = encode(hours, minutes, this.seconds, frames, type);
         updateData();
     }
 
@@ -200,7 +84,6 @@ public int getMinutes() {
 
     public void setMinutes(int minutes) {
         this.minutes = minutes;
-        this.encoded = encode(hours, this.minutes, seconds, frames, type);
         updateData();
     }
 
@@ -214,7 +97,6 @@ public int getHours() {
 
     public void setHours(int hours) {
         this.hours = hours;
-        this.encoded = encode(this.hours, minutes, seconds, frames, type);
         updateData();
     }
 
@@ -232,7 +114,6 @@ public int getFrameType() {
      */
     public void setFrameType(int type) {
         this.type = type;
-        this.encoded = encode(hours, minutes, seconds, frames, this.type);
         updateData();
     }