Skip to content

Compatibility changes required for YTPPlus PR + performance improvements #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
randompooper wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Compatibility changes required for YTPPlus PR + performance improvements #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7887826
So long quotes!
randompooper Jul 18, 2019
48e85ec
Add sleep between progress checks
randompooper Jul 18, 2019
ca697c6
Also update LAST_BROWSED after choosing sources
randompooper Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/ytpplusui/FXMLController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void addSource(ActionEvent event) {
sourceList.add(file.getAbsolutePath().replace('\\', '/'));
}
listviewSourcesList.setItems(sourceList);

LAST_BROWSED = selected.get(0).getParentFile();
}

@FXML
Expand All @@ -199,9 +199,9 @@ public void run() {
System.out.println("poop");
YTPGenerator generator = new YTPGenerator(TEMP + "tempoutput.mp4");
System.out.println("poop2");
generator.toolBox.FFMPEG = "\"" + tfFFMPEG.getText() + "\"";
generator.toolBox.FFPROBE = "\"" + tfFFPROBE.getText() + "\"";
generator.toolBox.MAGICK = "\"" + tfMAGICK.getText() + "\"";
generator.toolBox.FFMPEG = tfFFMPEG.getText();
generator.toolBox.FFPROBE = tfFFPROBE.getText();
generator.toolBox.MAGICK = tfMAGICK.getText();
System.out.println("poop3");
String jobDir = tfTEMP.getText() + "job_" + System.currentTimeMillis() + "/";
generator.toolBox.TEMP = jobDir;
Expand All @@ -227,7 +227,7 @@ public void run() {

System.out.println("poop5");
for (String source : sourceList) {
generator.addSource("\"" + source + "\"");
generator.addSource(source);
}
System.out.println("poop6");
int maxclips = Integer.parseInt(tfClipCount.getText());
Expand All @@ -244,7 +244,11 @@ public void run() {
System.out.println("poop8");
while (!generator.done) {
barProgress.setProgress(generator.doneCount);

try {
Thread.sleep(10);
} catch (InterruptedException ex) {
// Keep going
}
// System.out.println((elapsedTime * generator.doneCount ) - elapsedTime);
}
barProgress.setProgress(1);
Expand Down