Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Updated avs2wav tool (again) + fixed a bug with the "meta info" tab and the "edit" button.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-05-20 18:13:08 +02:00
parent 981538fb16
commit c44d0020c9
6 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gui/MainWindow.ui
View File

@ -1067,8 +1067,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>602</width> <width>604</width>
<height>1241</height> <height>1244</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_22"> <layout class="QGridLayout" name="gridLayout_22">
@ -2896,6 +2896,12 @@
<height>16</height> <height>16</height>
</size> </size>
</property> </property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -3459,6 +3465,8 @@
<include location="../res/Icons.qrc"/> <include location="../res/Icons.qrc"/>
<include location="../res/Icons.qrc"/> <include location="../res/Icons.qrc"/>
<include location="../res/Icons.qrc"/> <include location="../res/Icons.qrc"/>
<include location="../res/Icons.qrc"/>
<include location="../res/Icons.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

BIN
res/tools/avs2wav.exe
View File

Binary file not shown.

2
src/Config.h
View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_MINOR_LO 2
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 2 #define VER_LAMEXP_PATCH 2
#define VER_LAMEXP_BUILD 537 #define VER_LAMEXP_BUILD 538
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tools versions // Tools versions

2
src/Decoder_Avisynth.cpp
View File

@ -57,7 +57,7 @@ bool AvisynthDecoder::decode(const QString &sourceFile, const QString &outputFil
bool bTimeout = false; bool bTimeout = false;
bool bAborted = false; bool bAborted = false;
QRegExp regExp("please wait: (\\d+)/(\\d+) \\[(\\d+)%\\]"); QRegExp regExp("(\\d+)/(\\d+) \\[(\\d+)%\\]");
while(process.state() != QProcess::NotRunning) while(process.state() != QProcess::NotRunning)
{ {

10
src/Dialog_MainWindow.cpp
View File

@ -1626,11 +1626,15 @@ void MainWindow::editMetaButtonClicked(void)
ABORT_IF_BUSY; ABORT_IF_BUSY;
const QModelIndex index = metaDataView->currentIndex(); const QModelIndex index = metaDataView->currentIndex();
m_metaInfoModel->editItem(index, this);
if(index.row() == 4) if(index.isValid())
{ {
m_settings->metaInfoPosition(m_metaData->filePosition()); m_metaInfoModel->editItem(index, this);
if(index.row() == 4)
{
m_settings->metaInfoPosition(m_metaData->filePosition());
}
} }
} }

2
src/Thread_Initialization.cpp
View File

@ -56,7 +56,7 @@ g_lamexp_tools[] =
{"22253052acba92a0088bbf0aa82a8c505c07b854", CPU_TYPE_SSE, "aften.sse2.exe", 8}, {"22253052acba92a0088bbf0aa82a8c505c07b854", CPU_TYPE_SSE, "aften.sse2.exe", 8},
{"2996a48b01b65a2c1806482654beeea7ffcf1f80", CPU_TYPE_X64, "aften.x64.exe", 8}, {"2996a48b01b65a2c1806482654beeea7ffcf1f80", CPU_TYPE_X64, "aften.x64.exe", 8},
{"3b41f85dde8d4a5a0f4cd5f461099d0db24610ba", CPU_TYPE_ALL, "alac.exe", 20}, {"3b41f85dde8d4a5a0f4cd5f461099d0db24610ba", CPU_TYPE_ALL, "alac.exe", 20},
{"04fcf629e5a6049efe48b0b69bf662b605776832", CPU_TYPE_ALL, "avs2wav.exe", 12}, {"9ee16ef284a0e38f2696aecc412d0fd828bc6f6d", CPU_TYPE_ALL, "avs2wav.exe", 12},
{"fb74ac8b73ad8cba2c3b4e6e61f23401d630dc22", CPU_TYPE_ALL, "elevator.exe", UINT_MAX}, {"fb74ac8b73ad8cba2c3b4e6e61f23401d630dc22", CPU_TYPE_ALL, "elevator.exe", UINT_MAX},
{"80e372d8b20be24102c18284286fcdf5fa14bd86", CPU_TYPE_ALL, "faad.exe", 27}, {"80e372d8b20be24102c18284286fcdf5fa14bd86", CPU_TYPE_ALL, "faad.exe", 27},
{"d33cd86f04bd4067e244d2804466583c7b90a4e2", CPU_TYPE_ALL, "flac.exe", 121}, {"d33cd86f04bd4067e244d2804466583c7b90a4e2", CPU_TYPE_ALL, "flac.exe", 121},