diff --git a/.gitignore b/.gitignore index 8c380e6..2369199 100644 --- a/.gitignore +++ b/.gitignore @@ -44,4 +44,5 @@ config.json *.db log/ *.m3u -*.m3u8 \ No newline at end of file +*.m3u8 +*.mp4 \ No newline at end of file diff --git a/src/main/java/com/mykola2312/mptv/Main.java b/src/main/java/com/mykola2312/mptv/Main.java index 6dccdd4..daf92e6 100644 --- a/src/main/java/com/mykola2312/mptv/Main.java +++ b/src/main/java/com/mykola2312/mptv/Main.java @@ -3,6 +3,7 @@ package com.mykola2312.mptv; import com.mykola2312.mptv.config.Config; import com.mykola2312.mptv.crawler.Crawler; import com.mykola2312.mptv.db.DB; +import com.mykola2312.mptv.mpv.MPV; import com.mykola2312.mptv.task.TaskDispatcher; import com.mykola2312.mptv.ui.MainFrame; import org.apache.commons.cli.*; @@ -83,8 +84,15 @@ public class Main { new Thread(dispatcher).start(); // initialize ui - MainFrame frame = new MainFrame(); - frame.create(config.frame); + // MainFrame frame = new MainFrame(); + // frame.create(config.frame); + + try { + MPV mpv = new MPV("test.mp4"); + logger.info("spawned mpv"); + } catch (IOException e) { + logger.error("failed to start mpv", e); + } logger.info("mptv started"); } diff --git a/src/main/java/com/mykola2312/mptv/mpv/MPV.java b/src/main/java/com/mykola2312/mptv/mpv/MPV.java new file mode 100644 index 0000000..93b8f0f --- /dev/null +++ b/src/main/java/com/mykola2312/mptv/mpv/MPV.java @@ -0,0 +1,17 @@ +package com.mykola2312.mptv.mpv; + +import java.io.IOException; + +public class MPV { + private final Process process; + + public MPV(String url) throws IOException { + process = Runtime.getRuntime().exec(new String[] { + "mpv", url + }); + } + + public void stop() { + process.destroyForcibly(); + } +} diff --git a/src/main/java/com/mykola2312/mptv/ui/MenuPanel.java b/src/main/java/com/mykola2312/mptv/ui/MenuPanel.java index 40e8b53..bc8e2e6 100644 --- a/src/main/java/com/mykola2312/mptv/ui/MenuPanel.java +++ b/src/main/java/com/mykola2312/mptv/ui/MenuPanel.java @@ -3,8 +3,8 @@ package com.mykola2312.mptv.ui; import javax.swing.*; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; import org.jooq.impl.DSL; import com.mykola2312.mptv.db.DB; diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties deleted file mode 100644 index 43a7c4b..0000000 --- a/src/main/resources/log4j.properties +++ /dev/null @@ -1,17 +0,0 @@ -log4j.rootLogger=DEBUG, file, stdout - -# log_out -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=log/log_out.log -log4j.appender.File.Threshold=INFO -log4j.appender.file.MaxFileSize=1024KB -log4j.appender.file.MaxBackupIndex=2 -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n - -# stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Threshold=DEBUG -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n \ No newline at end of file