begin working on mpv integration
This commit is contained in:
parent
a6a6c7bca3
commit
4c8c068c87
5 changed files with 31 additions and 22 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -45,3 +45,4 @@ config.json
|
||||||
log/
|
log/
|
||||||
*.m3u
|
*.m3u
|
||||||
*.m3u8
|
*.m3u8
|
||||||
|
*.mp4
|
||||||
|
|
@ -3,6 +3,7 @@ package com.mykola2312.mptv;
|
||||||
import com.mykola2312.mptv.config.Config;
|
import com.mykola2312.mptv.config.Config;
|
||||||
import com.mykola2312.mptv.crawler.Crawler;
|
import com.mykola2312.mptv.crawler.Crawler;
|
||||||
import com.mykola2312.mptv.db.DB;
|
import com.mykola2312.mptv.db.DB;
|
||||||
|
import com.mykola2312.mptv.mpv.MPV;
|
||||||
import com.mykola2312.mptv.task.TaskDispatcher;
|
import com.mykola2312.mptv.task.TaskDispatcher;
|
||||||
import com.mykola2312.mptv.ui.MainFrame;
|
import com.mykola2312.mptv.ui.MainFrame;
|
||||||
import org.apache.commons.cli.*;
|
import org.apache.commons.cli.*;
|
||||||
|
|
@ -83,8 +84,15 @@ public class Main {
|
||||||
new Thread(dispatcher).start();
|
new Thread(dispatcher).start();
|
||||||
|
|
||||||
// initialize ui
|
// initialize ui
|
||||||
MainFrame frame = new MainFrame();
|
// MainFrame frame = new MainFrame();
|
||||||
frame.create(config.frame);
|
// 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");
|
logger.info("mptv started");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
17
src/main/java/com/mykola2312/mptv/mpv/MPV.java
Normal file
17
src/main/java/com/mykola2312/mptv/mpv/MPV.java
Normal file
|
|
@ -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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -3,8 +3,8 @@ package com.mykola2312.mptv.ui;
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
//import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
//import org.slf4j.LoggerFactory;
|
||||||
import org.jooq.impl.DSL;
|
import org.jooq.impl.DSL;
|
||||||
|
|
||||||
import com.mykola2312.mptv.db.DB;
|
import com.mykola2312.mptv.db.DB;
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
Loading…
Add table
Reference in a new issue