Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Don't try to detect 64-Bit Avisynth on the 32-Bit system + remove Avisynth header that is no longer required.

Browse Source
This commit is contained in:
LoRd_MuldeR 2015-03-05 21:41:50 +01:00
parent 0187a00f4d
commit 6713ccb41c
5 changed files with 14 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/3rd_party/avisynth_c.h vendored
View File

@ -1,79 +0,0 @@
// Avisynth C Interface Version 0.20
// Copyright 2003 Kevin Atkinson
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA, or visit
// http://www.gnu.org/copyleft/gpl.html .
//
// As a special exception, I give you permission to link to the
// Avisynth C interface with independent modules that communicate with
// the Avisynth C interface solely through the interfaces defined in
// avisynth_c.h, regardless of the license terms of these independent
// modules, and to copy and distribute the resulting combined work
// under terms of your choice, provided that every copy of the
// combined work is accompanied by a complete copy of the source code
// of the Avisynth C interface and Avisynth itself (with the version
// used to produce the combined work), being distributed under the
// terms of the GNU General Public License plus this exception. An
// independent module is a module which is not derived from or based
// on Avisynth C Interface, such as 3rd-party filters, import and
// export plugins, or graphical user interfaces.
// NOTE: this is a partial update of the Avisynth C interface to recognize
// new color spaces added in Avisynth 2.60. By no means is this document
// completely Avisynth 2.60 compliant.
#ifndef __AVISYNTH_C__
#define __AVISYNTH_C__
/* AVS uses a versioned interface to control backwards compatibility */
#define AVS_INTERFACE_25 2
/* Types */
typedef struct AVS_Clip AVS_Clip;
typedef struct AVS_ScriptEnvironment AVS_ScriptEnvironment;
/* AVS_Value is layed out identicly to AVSValue */
typedef struct AVS_Value AVS_Value;
struct AVS_Value
{
short type; // 'a'rray, 'c'lip, 'b'ool, 'i'nt, 'f'loat, 's'tring, 'v'oid, or 'l'ong
short array_size;
union
{
void * clip; // do not use directly, use avs_take_clip
char boolean;
int integer;
float floating_pt;
const char * string;
const AVS_Value * array;
} d;
};
/* Function pointers */
typedef AVS_ScriptEnvironment* (__stdcall *avs_create_script_environment_func)(int version);
typedef AVS_Value (__stdcall *avs_invoke_func)(AVS_ScriptEnvironment *, const char * name, AVS_Value args, const char** arg_names);
typedef int (__stdcall *avs_function_exists_func)(AVS_ScriptEnvironment *, const char * name);
typedef void (__stdcall *avs_delete_script_environment_func)(AVS_ScriptEnvironment *);
typedef void (__stdcall *avs_release_value_func)(AVS_Value);
/* Inline functions */
inline static int avs_is_int(AVS_Value v) { return v.type == 'i'; }
inline static int avs_is_float(AVS_Value v) { return v.type == 'f' || v.type == 'i'; }
inline static int avs_is_error(AVS_Value v) { return v.type == 'e'; }
inline static int avs_as_bool(AVS_Value v) { return v.d.boolean; }
inline static double avs_as_float(AVS_Value v) { return avs_is_int(v) ? v.d.integer : v.d.floating_pt; }
inline static AVS_Value avs_new_value_array(AVS_Value * v0, int size) { AVS_Value v; v.type = 'a'; v.d.array = v0; v.array_size = size; return v; }
#endif //__AVISYNTH_C__

7
src/thread_avisynth.cpp
View File

@ -188,6 +188,8 @@ void AvisynthCheckThread::detectAvisynthVersion3(int &success, const SysinfoMode
qDebug("Avisynth 32-Bit edition *not* found!");
}
if(sysinfo->getCPUFeatures(SysinfoModel::CPUFeatures_X64))
{
QFile *avsPath64;
if(checkAvisynth(sysinfo, avsPath64, true))
{
@ -200,6 +202,11 @@ void AvisynthCheckThread::detectAvisynthVersion3(int &success, const SysinfoMode
qDebug("Avisynth 64-Bit edition *not* found!");
}
}
else
{
qWarning("Skipping 64-Bit Avisynth check on non-x64 system!");
}
}
bool AvisynthCheckThread::checkAvisynth(const SysinfoModel *const sysinfo, QFile *&path, const bool &x64)
{

2
src/version.h
View File

@ -26,7 +26,7 @@
#define VER_X264_MAJOR 2
#define VER_X264_MINOR 5
#define VER_X264_PATCH 0
#define VER_X264_BUILD 932
#define VER_X264_BUILD 934
#define VER_X264_PORTABLE_EDITION (0)

1
x264_launcher_MSVC2013.vcxproj
View File

@ -338,7 +338,6 @@ copy /Y "$(QTDIR)\plugins\imageformats\qgif4.dll" "$(TargetDir)\imageformats"
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\$(ProjectName)\MOC_%(Filename).cpp;%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="resource.h" />
<ClInclude Include="src\3rd_party\avisynth_c.h" />
<ClInclude Include="src\binaries.h" />
<ClInclude Include="src\cli.h" />
<ClInclude Include="src\encoder_abstract.h" />

6
x264_launcher_MSVC2013.vcxproj.filters
View File

@ -22,9 +22,6 @@
<Filter Include="Assembly">
<UniqueIdentifier>{2c9c8836-2259-4412-894e-7cc32bef99de}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\3rd Party">
<UniqueIdentifier>{96b6acbb-5482-407a-8c18-381ec99d13e5}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="ReadMe.txt" />
@ -60,9 +57,6 @@
<ClInclude Include="src\job_object.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\3rd_party\avisynth_c.h">
<Filter>Header Files\3rd Party</Filter>
</ClInclude>
<ClInclude Include="src\cli.h">
<Filter>Header Files</Filter>
</ClInclude>