ganti versi tinylog 18/12/2024

.idea/libraries/tinylog_api.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="tinylog.api" type="repository">
+    <properties maven-id="org.tinylog:tinylog-api:2.5.0" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/tinylog/tinylog-api/2.5.0/tinylog-api-2.5.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/tinylog_impl.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="tinylog.impl" type="repository">
+    <properties maven-id="org.tinylog:tinylog-impl:2.7.0" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/tinylog/tinylog-impl/2.7.0/tinylog-impl-2.7.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/tinylog/tinylog-api/2.7.0/tinylog-api-2.7.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

Properties/tinylog.properties

@@ -1,4 +1,4 @@
 exception=unpack, strip: jdk.internal
 writer=console
 writer.exception=drop cause
-writer.format       = {date:dd-MM-yyyy HH:mm:ss} {class}.{method}()
+writer.format={date:dd-MM-yyyy HH:mm:ss} {class}.{method}() : {message}

SIPIntercom.iml

@@ -14,8 +14,9 @@
     <orderEntry type="library" name="io.javalin" level="project" />
     <orderEntry type="library" name="google.code.gson" level="project" />
     <orderEntry type="library" name="projectlombok.lombok" level="project" />
-    <orderEntry type="library" name="tinylog" level="project" />
     <orderEntry type="library" name="corundumstudio.socketio.netty" level="project" />
     <orderEntry type="library" name="slf4j.simple" level="project" />
+    <orderEntry type="library" name="tinylog.api" level="project" />
+    <orderEntry type="library" name="tinylog.impl" level="project" />
   </component>
 </module>

src/Audio/BassFileReader.java

@@ -3,7 +3,7 @@ package Audio;
 import com.sun.jna.Memory;
 import com.sun.jna.Pointer;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.media.SoundSource;
 
 /**

src/Audio/BassSoundManager.java

@@ -2,7 +2,7 @@ package Audio;
 import com.sun.jna.Memory;
 import com.sun.jna.Pointer;
 import peers.media.AbstractSoundManager;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.util.ArrayList;
 import java.util.List;

src/Audio/JSIPAudio.java

@@ -19,7 +19,7 @@ import com.sun.jna.Pointer;
 import com.sun.jna.Native;
 
 import Audio.Bass.BASS_DEVICEINFO;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 
 

src/Main.java

@@ -6,7 +6,7 @@ import SIP.jSIPClient;
 import SIP.javaSipEvents;
 import Webpage.*;
 import code.common;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.io.File;
 import java.net.Inet4Address;

src/SBC/GpioInput.java

@@ -2,7 +2,7 @@ package SBC;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

src/SBC/GpioOutput.java

@@ -1,7 +1,7 @@
 package SBC;
 
 import lombok.Getter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

src/SIP/CustomConfig.java

@@ -1,7 +1,7 @@
 package SIP;
 
 import code.common;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.Config;
 import peers.media.MediaMode;
 import peers.sip.syntaxencoding.SipURI;

src/SIP/jSIPClient.java

@@ -9,7 +9,7 @@ import Audio.*;
 import code.common;
 
 import lombok.Getter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.media.MediaManager;
 import peers.media.MediaMode;
 import peers.sip.Utils;
@@ -36,8 +36,11 @@ public class jSIPClient {
 	}
 
 	@Getter private String serverAddress;
+	@Getter private int serverPort;
 	@Getter private String Username;
 	@Getter private String Password;
+	@Getter private String audioInput;
+	@Getter private String audioOutput;
 	
 	public CustomConfig cc = new CustomConfig();
 	private EventManager em;
@@ -59,6 +62,7 @@ public class jSIPClient {
 		Disconnect();
 		if (cc==null) cc = new CustomConfig();
 		cc.setDomain(serverAddress);
+		cc.setSipPort(serverPort);
 		cc.setUserPart(Username);
 		cc.setPassword(Password);
 
@@ -258,7 +262,8 @@ public class jSIPClient {
 			//Logger lg = new FileLogger(null);
 //			Logger lg = null;
 //			jsm = new JavaxSoundManager(false, lg, null);
-			jsm = new BassSoundManager("H3 Audio","H3 Audio", new BassSoundManagerListener() {
+			Logger.info("Audio Input={}, Audio Output={}", audioInput, audioOutput);
+			jsm = new BassSoundManager(audioOutput,audioInput, new BassSoundManagerListener() {
 
 				@Override
 				public void Opened() {
@@ -575,8 +580,11 @@ public class jSIPClient {
 
 	private void load_config(Properties prop) {
 		serverAddress =  GetProperties_StringValue(prop,"SipServer","rdkartono.ddns.me");
+		serverPort = GetProperties_IntValue(prop,"SipPort",5060);
 		Username = GetProperties_StringValue(prop,"SipUsername","101");
 		Password = GetProperties_StringValue(prop,"SipPassword","password101");
+		audioInput = GetProperties_StringValue(prop,"AudioInputDevice","Default");
+		audioOutput = GetProperties_StringValue(prop,"AudioOutputDevice","Default");
 		Logger.info("SIP Server={}, Username={}, Password={}", serverAddress, Username, Password);
 	}
 }

src/Webpage/SocketioResponse.java

@@ -5,7 +5,7 @@ import SBC.RamInformation;
 import com.google.gson.JsonObject;
 import lombok.Getter;
 import lombok.Setter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.util.Map;
 

src/Webpage/SocketioServer.java

@@ -6,7 +6,7 @@ import com.corundumstudio.socketio.SocketIOServer;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 
 import java.util.function.Function;

src/Webpage/WebServer.java

@@ -5,7 +5,7 @@ import io.javalin.http.HttpCode;
 import io.javalin.http.staticfiles.Location;
 import lombok.Getter;
 import lombok.Setter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.util.Objects;
 import java.util.Properties;

src/code/common.java

@@ -3,7 +3,7 @@ package code;
 import com.google.gson.Gson;
 import com.sun.jna.Platform;
 import org.jetbrains.annotations.NotNull;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.syntaxencoding.SipHeaderFieldName;
 import peers.sip.syntaxencoding.SipHeaderFieldValue;
 import peers.sip.syntaxencoding.SipHeaders;

src/peers/XmlConfig.java

@@ -35,7 +35,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.media.MediaMode;
 import peers.sip.RFC3261;
 import peers.sip.syntaxencoding.SipURI;

src/peers/javaxsound/JavaxSoundManager.java

@@ -36,7 +36,7 @@ import javax.sound.sampled.SourceDataLine;
 import javax.sound.sampled.TargetDataLine;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.media.AbstractSoundManager;
 import peers.sip.Utils;
 

src/peers/media/Capture.java

@@ -19,7 +19,7 @@
 
 package peers.media;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.io.IOException;
 import java.io.PipedOutputStream;

src/peers/media/CaptureRtpSender.java

@@ -26,7 +26,7 @@ import java.util.concurrent.CountDownLatch;
 
 
 import lombok.Getter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.rtp.RFC3551;
 import peers.rtp.RtpSession;
 import peers.sdp.Codec;

src/peers/media/Echo.java

@@ -19,7 +19,7 @@
 
 package peers.media;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.io.IOException;
 import java.net.DatagramPacket;

src/peers/media/Encoder.java

@@ -19,7 +19,7 @@
 
 package peers.media;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.io.File;
 import java.io.FileNotFoundException;

src/peers/media/FileReader.java

@@ -18,7 +18,7 @@
 */
 package peers.media;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;

src/peers/media/IncomingRtpReader.java

@@ -22,7 +22,7 @@ package peers.media;
 import java.io.IOException;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.rtp.RFC3551;
 import peers.rtp.RtpListener;
 import peers.rtp.RtpPacket;

src/peers/media/MediaManager.java

@@ -29,7 +29,7 @@ import Audio.BassFileReader;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.rtp.RtpPacket;
 import peers.rtp.RtpSession;
 import peers.sdp.Codec;

src/peers/media/RtpSender.java

@@ -33,7 +33,7 @@ import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.rtp.RtpPacket;
 import peers.rtp.RtpSession;
 import peers.sdp.Codec;

src/peers/nat/PeerManager.java

@@ -26,7 +26,7 @@ import java.net.InetAddress;
 import java.net.SocketException;
 
 import lombok.Setter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

src/peers/nat/UDPReceiver.java

@@ -19,7 +19,7 @@
 
 package peers.nat;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 import java.io.IOException;
 import java.net.DatagramPacket;

src/peers/rtp/RtpParser.java

@@ -20,7 +20,7 @@
 package peers.rtp;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 // RFC 3550
 public class RtpParser {

src/peers/rtp/RtpSession.java

@@ -39,7 +39,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.RejectedExecutionException;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.media.AbstractSoundManager;
 
 /**

src/peers/sdp/SDPManager.java

@@ -26,7 +26,7 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Random;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.Config;
 
 import peers.rtp.RFC3551;

src/peers/sip/AbstractState.java

@@ -20,7 +20,7 @@
 package peers.sip;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 public abstract class AbstractState {
     

src/peers/sip/core/useragent/ChallengeManager.java

@@ -26,7 +26,7 @@ import java.security.NoSuchAlgorithmException;
 
 import java.util.UUID;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.Config;
 
 import peers.sip.RFC2617;

src/peers/sip/core/useragent/InitialRequestManager.java

@@ -20,7 +20,7 @@
 package peers.sip.core.useragent;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.Utils;
 import peers.sip.core.useragent.handlers.ByeHandler;

src/peers/sip/core/useragent/MidDialogRequestManager.java

@@ -24,7 +24,7 @@ import java.net.UnknownHostException;
 import java.util.Hashtable;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.core.useragent.handlers.ByeHandler;
 import peers.sip.core.useragent.handlers.CancelHandler;

src/peers/sip/core/useragent/RequestManager.java

@@ -20,7 +20,7 @@
 package peers.sip.core.useragent;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.core.useragent.handlers.ByeHandler;
 import peers.sip.core.useragent.handlers.CancelHandler;

src/peers/sip/core/useragent/UAC.java

@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.List;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.Utils;
 import peers.sip.syntaxencoding.SipHeaderFieldName;

src/peers/sip/core/useragent/handlers/ByeHandler.java

@@ -20,7 +20,7 @@
 package peers.sip.core.useragent.handlers;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.core.useragent.RequestManager;
 import peers.sip.core.useragent.SipListener;

src/peers/sip/core/useragent/handlers/CancelHandler.java

@@ -20,7 +20,7 @@
 package peers.sip.core.useragent.handlers;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.Utils;
 import peers.sip.core.useragent.MidDialogRequestManager;

src/peers/sip/core/useragent/handlers/DialogMethodHandler.java

@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.TimerTask;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.core.useragent.UserAgent;
 import peers.sip.syntaxencoding.NameAddress;

src/peers/sip/core/useragent/handlers/InviteHandler.java

@@ -32,7 +32,7 @@ import java.util.List;
 import java.util.Timer;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.media.MediaManager;
 import peers.sdp.Codec;
 import peers.sdp.MediaDestination;

src/peers/sip/core/useragent/handlers/OptionsHandler.java

@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.util.Random;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sdp.SessionDescription;
 import peers.sip.RFC3261;
 import peers.sip.Utils;

src/peers/sip/core/useragent/handlers/RegisterHandler.java

@@ -27,7 +27,7 @@ import java.util.TimerTask;
 
 import lombok.Getter;
 import lombok.Setter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.Config;
 
 import peers.sip.RFC3261;

src/peers/sip/transaction/InviteClientTransaction.java

@@ -25,7 +25,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.Utils;
 import peers.sip.syntaxencoding.SipHeaderFieldName;

src/peers/sip/transaction/InviteServerTransaction.java

@@ -24,7 +24,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.transport.SipMessage;
 import peers.sip.transport.SipRequest;

src/peers/sip/transaction/NonInviteClientTransaction.java

@@ -25,7 +25,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.syntaxencoding.SipHeaderFieldName;
 import peers.sip.syntaxencoding.SipHeaderFieldValue;

src/peers/sip/transaction/NonInviteServerTransaction.java

@@ -24,7 +24,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.transport.SipRequest;
 import peers.sip.transport.SipResponse;

src/peers/sip/transactionuser/Dialog.java

@@ -22,7 +22,7 @@ package peers.sip.transactionuser;
 import java.util.ArrayList;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.sip.RFC3261;
 import peers.sip.Utils;
 import peers.sip.syntaxencoding.NameAddress;

src/peers/sip/transactionuser/DialogStateConfirmed.java

@@ -20,7 +20,7 @@
 package peers.sip.transactionuser;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 public class DialogStateConfirmed extends DialogState {
 

src/peers/sip/transactionuser/DialogStateEarly.java

@@ -20,7 +20,7 @@
 package peers.sip.transactionuser;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 public class DialogStateEarly extends DialogState {
     

src/peers/sip/transactionuser/DialogStateInit.java

@@ -20,7 +20,7 @@
 package peers.sip.transactionuser;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 public class DialogStateInit extends DialogState {
     

src/peers/sip/transactionuser/DialogStateTerminated.java

@@ -20,7 +20,7 @@
 package peers.sip.transactionuser;
 
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 
 public class DialogStateTerminated extends DialogState {
 

src/peers/sip/transport/MessageReceiver.java

@@ -27,7 +27,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 
 import lombok.Setter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.Config;
 
 import peers.sip.RFC3261;

src/peers/sip/transport/MessageSender.java

@@ -25,7 +25,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import lombok.Getter;
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.Config;
 
 import peers.sip.RFC3261;

src/peers/sip/transport/TransportManager.java

@@ -43,7 +43,7 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Hashtable;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.Config;
 
 import peers.sip.RFC3261;

src/peers/sip/transport/UdpMessageReceiver.java

@@ -26,7 +26,7 @@ import java.net.SocketTimeoutException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.Config;
 
 import peers.sip.RFC3261;

src/peers/sip/transport/UdpMessageSender.java

@@ -25,7 +25,7 @@ import java.net.InetAddress;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
-import org.pmw.tinylog.Logger;
+import org.tinylog.Logger;
 import peers.Config;
 
 import peers.sip.RFC3261;