diff --git a/src/com/ixab/GUI/ConfigLoadMenu.form b/src/com/ixab/GUI/ConfigLoadMenu.form deleted file mode 100644 index dfab454..0000000 --- a/src/com/ixab/GUI/ConfigLoadMenu.form +++ /dev/null @@ -1,52 +0,0 @@ - -
diff --git a/src/com/ixab/GUI/ConfigLoadMenu.java b/src/com/ixab/GUI/ConfigLoadMenu.java deleted file mode 100644 index ee6b34f..0000000 --- a/src/com/ixab/GUI/ConfigLoadMenu.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.ixab.GUI; - -import com.ixab.ConfigHandling.Config; -import com.ixab.ConfigHandling.ConfigFileIOHandler; -import com.ixab.ConfigHandling.ConfigFileInstanceHandler; - -import javax.swing.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -public class ConfigLoadMenu { - private static JFrame frame; - private JPanel panel; - private JTextField textField1; - private JButton auswählenButton; - private JButton ladeKonfigurationButton; - - public ConfigLoadMenu() { - auswählenButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - final JFileChooser jf = new JFileChooser(); - jf.showOpenDialog(frame); - textField1.setText(jf.getSelectedFile().getAbsolutePath()); - ladeKonfigurationButton.setText("Lade Konfiguration"); - ladeKonfigurationButton.setEnabled(true); - } - }); - ladeKonfigurationButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - Config c = ConfigFileIOHandler.load(textField1.getText()); - if (c == null) { - ladeKonfigurationButton.setText("ACHTUNG: Fehler beim Laden, neue Datei wählen!"); - ladeKonfigurationButton.setEnabled(false); - } else { - ConfigFileInstanceHandler.setConfig(c); - StreamChooserMenu.main(null); - frame.dispose(); - } - } - }); - } - - public static void main(String[] args) { - frame = new JFrame("ConfigLoadMenu"); - frame.setContentPane(new ConfigLoadMenu().panel); - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - frame.pack(); - frame.setVisible(true); - } -} diff --git a/src/com/ixab/StreamHandling/StreamOpener.java b/src/com/ixab/StreamHandling/StreamOpener.java index 3891af8..0b9b566 100644 --- a/src/com/ixab/StreamHandling/StreamOpener.java +++ b/src/com/ixab/StreamHandling/StreamOpener.java @@ -17,7 +17,6 @@ public class StreamOpener extends Thread { public void run() { try { Runtime rt = Runtime.getRuntime(); - //Process pr = rt.exec("cmd /c dir"); Process pr = rt.exec(c.getLSPath()+" twitch.tv/"+c.getStreamName(streamIndex)+" "+quality); BufferedReader input = new BufferedReader(new InputStreamReader(pr.getInputStream())); diff --git a/src/lib/JSON/json-20141113.jar b/src/lib/JSON/json-20141113.jar new file mode 100644 index 0000000..015c308 Binary files /dev/null and b/src/lib/JSON/json-20141113.jar differ