[Avidemux-svn-commit] r3705 - in branches/avidemux_2.4_branch/avidemux: . ADM_filter ADM_userInterfaces/ADM_QT4/ADM_gui ADM_userInterfaces/ADM_commonUI
mean at BerliOS
mean at mail.berlios.de
Sun Nov 25 14:47:15 CET 2007
Author: mean
Date: 2007-11-25 14:47:14 +0100 (Sun, 25 Nov 2007)
New Revision: 3705
Modified:
branches/avidemux_2.4_branch/avidemux/ADM_filter/vidVCD.cpp
branches/avidemux_2.4_branch/avidemux/ADM_filter/vidVCD.h
branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui2.ui
branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/translation_table.h
branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_resizeWiz.cpp
branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_resizeWiz.h
branches/avidemux_2.4_branch/avidemux/gui_autodrive.cpp
Log:
[Sikon] Add 640*480 profile for Ipod
Modified: branches/avidemux_2.4_branch/avidemux/ADM_filter/vidVCD.cpp
===================================================================
--- branches/avidemux_2.4_branch/avidemux/ADM_filter/vidVCD.cpp 2007-11-25 10:18:10 UTC (rev 3704)
+++ branches/avidemux_2.4_branch/avidemux/ADM_filter/vidVCD.cpp 2007-11-25 13:47:14 UTC (rev 3705)
@@ -73,11 +73,13 @@
static targetFmt PSP={480, 480, 272, 272};
static targetFmt PSPH264={720, 720, 480, 480};
static targetFmt IPOD={320, 320, 240, 240};
+static targetFmt IPOD640={640, 640, 480, 480};
+
/* Dont forget to update DIA_resizeWiz if you change something here */
-targetFmt *allFormats[7]={&VCD,&SVCD,&DVD,&DVDHD1,&PSP,&PSPH264,&IPOD};
+targetFmt *allFormats[]={&VCD,&SVCD,&DVD,&DVDHD1,&PSP,&PSPH264,&IPOD,&IPOD640};
extern AVDMGenericVideoStream *createResampleFps(AVDMGenericVideoStream *in,uint32_t targetfps1000);
-#define ARME(x) format=RESWIZ_##x;
+#define ARME(x) format=RESWIZ_##x
uint8_t setVCD (void)
{
Modified: branches/avidemux_2.4_branch/avidemux/ADM_filter/vidVCD.h
===================================================================
--- branches/avidemux_2.4_branch/avidemux/ADM_filter/vidVCD.h 2007-11-25 10:18:10 UTC (rev 3704)
+++ branches/avidemux_2.4_branch/avidemux/ADM_filter/vidVCD.h 2007-11-25 13:47:14 UTC (rev 3705)
@@ -26,6 +26,6 @@
uint8_t setPSPFullRes(void);
uint8_t setDVD( void );
uint8_t setHalfD1( void );
-uint8_t setIPOD( void );
+uint8_t setIPOD( void);
-#endif
\ No newline at end of file
+#endif
Modified: branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui2.ui
===================================================================
--- branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui2.ui 2007-11-25 10:18:10 UTC (rev 3704)
+++ branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui2.ui 2007-11-25 13:47:14 UTC (rev 3705)
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>838</width>
- <height>543</height>
+ <height>568</height>
</rect>
</property>
<property name="windowTitle" >
@@ -24,42 +24,76 @@
</property>
<widget class="QWidget" name="centralwidget" >
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>9</number>
+ </property>
+ <property name="topMargin" >
+ <number>9</number>
+ </property>
+ <property name="rightMargin" >
+ <number>9</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>9</number>
+ </property>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<layout class="QVBoxLayout" >
- <property name="margin" >
+ <property name="spacing" >
<number>0</number>
</property>
- <property name="spacing" >
+ <property name="leftMargin" >
<number>0</number>
</property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QLabel" name="label_3" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -96,12 +130,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
+ <property name="spacing" >
<number>0</number>
</property>
- <property name="spacing" >
+ <property name="leftMargin" >
<number>0</number>
</property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<spacer>
<property name="orientation" >
@@ -120,18 +163,25 @@
</item>
<item>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QComboBox" name="comboBoxVideo" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -149,9 +199,7 @@
<bool>true</bool>
</property>
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -167,9 +215,7 @@
<bool>true</bool>
</property>
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -202,9 +248,7 @@
<item>
<widget class="QLabel" name="label_5" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -241,12 +285,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
+ <property name="spacing" >
<number>0</number>
</property>
- <property name="spacing" >
+ <property name="leftMargin" >
<number>0</number>
</property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<spacer>
<property name="orientation" >
@@ -265,18 +318,25 @@
</item>
<item>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QComboBox" name="comboBoxAudio" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -294,9 +354,7 @@
<bool>true</bool>
</property>
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -312,9 +370,7 @@
<bool>true</bool>
</property>
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -326,12 +382,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QCheckBox" name="checkBox_TimeShift" >
<property name="text" >
@@ -342,19 +407,17 @@
<item>
<widget class="QSpinBox" name="spinBox_TimeValue" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimum" >
+ <number>-99999</number>
+ </property>
<property name="maximum" >
<number>99999</number>
</property>
- <property name="minimum" >
- <number>-99999</number>
- </property>
</widget>
</item>
</layout>
@@ -382,9 +445,7 @@
<item>
<widget class="QLabel" name="label_4" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -415,12 +476,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
+ <property name="spacing" >
<number>0</number>
</property>
- <property name="spacing" >
+ <property name="leftMargin" >
<number>0</number>
</property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<spacer>
<property name="orientation" >
@@ -440,9 +510,7 @@
<item>
<widget class="QComboBox" name="comboBoxFormat" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -473,18 +541,25 @@
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QFrame" name="frame_video" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>7</vsizetype>
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -531,20 +606,38 @@
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<spacer>
<property name="orientation" >
@@ -564,9 +657,7 @@
<item>
<widget class="ADM_QSlider" name="horizontalSlider" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -578,12 +669,21 @@
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QToolButton" name="toolButtonPlay" >
<property name="text" >
@@ -829,18 +929,25 @@
</item>
<item>
<layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QLabel" name="label" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>5</vsizetype>
+ <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -864,9 +971,7 @@
<item>
<widget class="QLineEdit" name="lineEdit" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -900,9 +1005,7 @@
<item>
<widget class="QLabel" name="label_2" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>5</vsizetype>
+ <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -931,9 +1034,7 @@
<item>
<widget class="QLabel" name="label_6" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>5</vsizetype>
+ <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -957,9 +1058,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_2" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -981,9 +1080,7 @@
<item>
<widget class="QLabel" name="label_7" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>5</vsizetype>
+ <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -1030,9 +1127,7 @@
<item>
<widget class="QLabel" name="label_8" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>5</vsizetype>
+ <sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -1077,12 +1172,21 @@
</item>
<item>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>6</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<spacer>
<property name="orientation" >
@@ -1102,9 +1206,7 @@
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>1</vsizetype>
+ <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -1190,9 +1292,7 @@
</rect>
</property>
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -1222,9 +1322,7 @@
</rect>
</property>
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -1269,12 +1367,21 @@
</item>
<item>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
<property name="spacing" >
<number>4</number>
</property>
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<spacer>
<property name="orientation" >
@@ -1313,9 +1420,7 @@
<item>
<widget class="QSlider" name="horizontalSlider_2" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>1</vsizetype>
+ <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -1349,7 +1454,7 @@
<x>0</x>
<y>0</y>
<width>838</width>
- <height>23</height>
+ <height>25</height>
</rect>
</property>
<widget class="QMenu" name="menuHelp" >
@@ -1507,6 +1612,7 @@
<addaction name="actionPSP" />
<addaction name="actionPSP_H264" />
<addaction name="actionFLV" />
+ <addaction name="actionIPOD" />
</widget>
<addaction name="menuFile" />
<addaction name="menuEdit" />
@@ -1525,8 +1631,11 @@
<enum>Qt::Horizontal</enum>
</property>
<attribute name="toolBarArea" >
- <number>4</number>
+ <enum>TopToolBarArea</enum>
</attribute>
+ <attribute name="toolBarBreak" >
+ <bool>false</bool>
+ </attribute>
<addaction name="separator" />
<addaction name="actionOpen" />
<addaction name="actionSave_video" />
@@ -1542,8 +1651,11 @@
<enum>Qt::Horizontal</enum>
</property>
<attribute name="toolBarArea" >
- <number>4</number>
+ <enum>TopToolBarArea</enum>
</attribute>
+ <attribute name="toolBarBreak" >
+ <bool>false</bool>
+ </attribute>
<addaction name="actionPreviewInput" />
<addaction name="actionPreviewOutput" />
<addaction name="actionPreviewSide" />
@@ -2378,6 +2490,11 @@
<string>FLV</string>
</property>
</action>
+ <action name="actionIPOD" >
+ <property name="text" >
+ <string>IPOD (mpeg4)</string>
+ </property>
+ </action>
</widget>
<customwidgets>
<customwidget>
Modified: branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/translation_table.h
===================================================================
--- branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/translation_table.h 2007-11-25 10:18:10 UTC (rev 3704)
+++ branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/translation_table.h 2007-11-25 13:47:14 UTC (rev 3705)
@@ -65,6 +65,7 @@
PROCESS(actionPSP,ACT_AUTO_PSP) \
PROCESS(actionFLV,ACT_AUTO_FLV) \
PROCESS(actionPSP_H264,ACT_AUTO_PSP_H264)\
+PROCESS(actionIPOD,ACT_AUTO_IPOD) \
PROCESS(actionAdd_to_joblist,ACT_ADD_JOB) \
PROCESS(actionShow_Joblist,ACT_HANDLE_JOB)
Modified: branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_resizeWiz.cpp
===================================================================
--- branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_resizeWiz.cpp 2007-11-25 10:18:10 UTC (rev 3704)
+++ branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_resizeWiz.cpp 2007-11-25 13:47:14 UTC (rev 3705)
@@ -29,7 +29,7 @@
{
uint8_t r=0;
#define ONELINE(x,y) {RESWIZ_##x,y,NULL}
- diaMenuEntry menuFTarget[7]={
+ diaMenuEntry menuFTarget[]={
ONELINE(VCD,QT_TR_NOOP("VCD")),
ONELINE(SVCD,QT_TR_NOOP("SVCD")),
ONELINE(DVD,QT_TR_NOOP("DVD")),
@@ -37,6 +37,7 @@
ONELINE(PSP,QT_TR_NOOP("PSP 480*272")),
ONELINE(PSP_FULLRES,QT_TR_NOOP("PSP full res (720*480")),
ONELINE(IPOD,"IPOD 320*240"),
+ ONELINE(IPOD640,"IPOD 640*480"),
};
diaMenuEntry menuFAspect[3]={
{RESWIZ_AR_1_1,QT_TR_NOOP("1:1"),NULL},
@@ -50,7 +51,7 @@
uint32_t tsource=(uint32_t )*source;
uint32_t tdestination=(uint32_t )*destination;
- diaElemMenu menu1(&tformat,QT_TR_NOOP("_Target type:"), 7,menuFTarget);
+ diaElemMenu menu1(&tformat,QT_TR_NOOP("_Target type:"), sizeof(menuFTarget) / sizeof(diaMenuEntry),menuFTarget);
diaElemMenu menu2(&tsource,QT_TR_NOOP("_Source aspect ratio:"), 3,menuFAspect);
diaElemMenu menu3(&tdestination,QT_TR_NOOP("_Destination aspect ratio:"), 3,menuFAspect);
Modified: branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_resizeWiz.h
===================================================================
--- branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_resizeWiz.h 2007-11-25 10:18:10 UTC (rev 3704)
+++ branches/avidemux_2.4_branch/avidemux/ADM_userInterfaces/ADM_commonUI/DIA_resizeWiz.h 2007-11-25 13:47:14 UTC (rev 3705)
@@ -28,7 +28,8 @@
RESWIZ_DVD_HD1,
RESWIZ_PSP,
RESWIZ_PSP_FULLRES,
- RESWIZ_IPOD
+ RESWIZ_IPOD,
+ RESWIZ_IPOD640
}RESWIZ_FORMAT;
Modified: branches/avidemux_2.4_branch/avidemux/gui_autodrive.cpp
===================================================================
--- branches/avidemux_2.4_branch/avidemux/gui_autodrive.cpp 2007-11-25 10:18:10 UTC (rev 3704)
+++ branches/avidemux_2.4_branch/avidemux/gui_autodrive.cpp 2007-11-25 13:47:14 UTC (rev 3705)
@@ -58,17 +58,20 @@
switch(action)
{
case ACT_AUTO_IPOD:
-#if !defined(USE_XVID_4) || !defined(USE_FAAC)
+#if !defined(USE_XVID_4) || (!defined(USE_FAAC) && !defined(HAVE_MP3LAME))
GUI_Error_HIG(QT_TR_NOOP("Codec Error"),
- QT_TR_NOOP( "You need both Xvid4 and FAAC support for Ipod profile"));
+ QT_TR_NOOP( "You need Xvid4 and either LAME or FAAC support for the iPod profile"));
#else
- if(!setIPOD()) return 0;
+ if(!setIPOD())
+ {
+ return 0;
+ }
// Video codec
if(!videoCodecSelectByName("XVID4"))
{
- GUI_Error_HIG(QT_TR_NOOP("Codec Error"),QT_TR_NOOP( "Cannot select mpeg4 sp codec."));
+ GUI_Error_HIG(QT_TR_NOOP("Codec Error"),QT_TR_NOOP( "Cannot select the MPEG-4 SP codec."));
return 0;
}
setIpod_Xvid4Preset();
@@ -76,13 +79,18 @@
setVideoEncoderSettings(COMPRESS_CBR,400,0,NULL);
// Audio Codec
if( (currentaudiostream->getInfo()->channels==2)&&
- (currentaudiostream->getInfo()->encoding==WAV_AAC))
+ (currentaudiostream->getInfo()->encoding==WAV_AAC ||
+ currentaudiostream->getInfo()->encoding==WAV_MP3))
{
audioCodecSetcodec(AUDIOENC_COPY);
}
else
{
+#if defined(USE_FAAC)
audioCodecSetcodec(AUDIOENC_FAAC);
+#elif defined(HAVE_MP3LAME)
+ audioCodecSetcodec(AUDIOENC_MP3);
+#endif
audioFilter_SetBitrate(128);
}
#endif
More information about the Avidemux-svn-commit
mailing list