From 9cb150f4304b64bc7e1b61268b570d1d483b29f6 Mon Sep 17 00:00:00 2001 From: yuki Date: Sat, 2 May 2009 09:33:34 +0000 Subject: [PATCH] =?utf8?q?=E3=82=AA=E3=83=AA=E3=82=B8=E3=83=8A=E3=83=ABr54?= =?utf8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=E3=81=AE=E4=B8=80=E9=83=A8.=20?= =?utf8?q?=E3=82=AF=E3=83=A9=E3=82=B9=E5=90=8D=E5=A4=89=E6=9B=B4=20FFmpegC?= =?utf8?q?omboBoxModel=20->=20OptionComboBoxModel?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://192.168.11.7/svn/saccubus/trunk@13 c066991c-cf13-ec4a-a49a-846e61667af5 --- frontend/nbproject/project.properties | 2 +- frontend/saccubus.xml | 43 ++++++++++++++++++++++ frontend/src/saccubus/MainFrame.java | 2 +- ...ComboBoxModel.java => OptionComboBoxModel.java} | 6 +-- 4 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 frontend/saccubus.xml rename frontend/src/saccubus/{FFmpegComboBoxModel.java => OptionComboBoxModel.java} (96%) diff --git a/frontend/nbproject/project.properties b/frontend/nbproject/project.properties index 3eb9d9c..6728896 100644 --- a/frontend/nbproject/project.properties +++ b/frontend/nbproject/project.properties @@ -44,7 +44,7 @@ javadoc.splitindex=true javadoc.use=true javadoc.version=false javadoc.windowtitle= -main.class= +main.class=saccubus.Saccubus manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF platform.active=default_platform diff --git a/frontend/saccubus.xml b/frontend/saccubus.xml new file mode 100644 index 0000000..1c1e2f7 --- /dev/null +++ b/frontend/saccubus.xml @@ -0,0 +1,43 @@ + + + +settings +true +1 +true +500 +true +1 +true +true +.\video.flv + +.\[out]comment +.\[out]video + +true +false +C:\WINDOWS\Fonts\msgothic.ttc + +true +30 +-s 512x384 -acodec libmp3lame -ab 128k -ar 44100 -ac 2 -vcodec libxvid -qscale 3 -async 1 +false +.\video.avi + +false +-1 +false +avi +.\bin\nicovideo.dll + + +.\[out]converted +.\comment.xml +false +.\bin\ffmpeg.exe +false +true +true + + diff --git a/frontend/src/saccubus/MainFrame.java b/frontend/src/saccubus/MainFrame.java index 26b282c..95a4a00 100644 --- a/frontend/src/saccubus/MainFrame.java +++ b/frontend/src/saccubus/MainFrame.java @@ -1551,7 +1551,7 @@ public class MainFrame extends JFrame { * * @return javax.swing.JComboBox */ - private final FFmpegComboBoxModel FFmpegOptionModel = new FFmpegComboBoxModel(); + private final OptionComboBoxModel FFmpegOptionModel = new OptionComboBoxModel(); private JLabel ExtOptionLabel = null; diff --git a/frontend/src/saccubus/FFmpegComboBoxModel.java b/frontend/src/saccubus/OptionComboBoxModel.java similarity index 96% rename from frontend/src/saccubus/FFmpegComboBoxModel.java rename to frontend/src/saccubus/OptionComboBoxModel.java index 687bb2b..8b755d7 100644 --- a/frontend/src/saccubus/FFmpegComboBoxModel.java +++ b/frontend/src/saccubus/OptionComboBoxModel.java @@ -8,11 +8,12 @@ import java.util.ArrayList; import javax.swing.DefaultComboBoxModel; + /** * @author Account01 * */ -public class FFmpegComboBoxModel extends DefaultComboBoxModel { +public class OptionComboBoxModel extends DefaultComboBoxModel { /** * */ @@ -25,7 +26,7 @@ public class FFmpegComboBoxModel extends DefaultComboBoxModel { private int Index = 0; - public FFmpegComboBoxModel() { + public OptionComboBoxModel() { reload(); } @@ -129,7 +130,6 @@ public class FFmpegComboBoxModel extends DefaultComboBoxModel { } } - class FFmpegSelectedItem { private final int Index; -- 2.11.0