...
 
Commits (1)
......@@ -10,13 +10,26 @@ set(kdenlive_render_SRCS
kdenlive_render.cpp
renderjob.cpp
)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
add_executable(kdenlive_render ${kdenlive_render_SRCS})
ecm_mark_nongui_executable(kdenlive_render)
set(mlt_SRCS
io.c
melt.c
)
add_executable(kdenlive_melt ${mlt_SRCS})
ecm_mark_nongui_executable(kdenlive_melt)
target_link_libraries(kdenlive_melt
${MLT_LIBRARIES}
${MLTPP_LIBRARIES})
target_link_libraries(kdenlive_render Qt5::Core Qt5::DBus Qt5::Xml
${MLT_LIBRARIES}
${MLTPP_LIBRARIES})
install(TARGETS kdenlive_render DESTINATION ${BIN_INSTALL_DIR})
install(TARGETS kdenlive_melt DESTINATION ${BIN_INSTALL_DIR})
/*
* io.c -- melt input/output
* Copyright (C) 2002-2015 Meltytech, LLC
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
/* System header files */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#ifndef _WIN32
#include <termios.h>
#else
// MinGW defines struct timespec in pthread.h
#include <pthread.h>
// for nanosleep()
#include <framework/mlt_types.h>
#include <windows.h>
#endif
#include <unistd.h>
#include <sys/time.h>
/* Application header files */
#include "io.h"
char *chomp( char *input )
{
if ( input != NULL )
{
int length = strlen( input );
if ( length && input[ length - 1 ] == '\n' )
input[ length - 1 ] = '\0';
if ( length > 1 && input[ length - 2 ] == '\r' )
input[ length - 2 ] = '\0';
}
return input;
}
char *trim( char *input )
{
if ( input != NULL )
{
int length = strlen( input );
int first = 0;
while( first < length && isspace( input[ first ] ) )
first ++;
memmove( input, input + first, length - first + 1 );
length = length - first;
while ( length > 0 && isspace( input[ length - 1 ] ) )
input[ -- length ] = '\0';
}
return input;
}
char *strip_quotes( char *input )
{
if ( input != NULL )
{
char *ptr = strrchr( input, '\"' );
if ( ptr != NULL )
*ptr = '\0';
if ( input[ 0 ] == '\"' )
strcpy( input, input + 1 );
}
return input;
}
int *get_int( int *output, int use )
{
int *value = NULL;
char temp[ 132 ];
*output = use;
if ( trim( chomp( fgets( temp, 132, stdin ) ) ) != NULL )
{
if ( strcmp( temp, "" ) )
*output = atoi( temp );
value = output;
}
return value;
}
/** This stores the previous settings
*/
#ifndef _WIN32
static struct termios oldtty;
#else
static DWORD oldtty;
#endif
static int mode = 0;
/** This is called automatically on application exit to restore the
previous tty settings.
*/
void term_exit(void)
{
if ( mode == 1 )
{
#ifndef _WIN32
tcsetattr( 0, TCSANOW, &oldtty );
#else
HANDLE h = GetStdHandle( STD_INPUT_HANDLE );
if (h) {
SetConsoleMode( h, oldtty );
}
#endif
mode = 0;
}
}
/** Init terminal so that we can grab keys without blocking.
*/
void term_init( )
{
#ifndef _WIN32
struct termios tty;
tcgetattr( 0, &tty );
oldtty = tty;
tty.c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
tty.c_oflag |= OPOST;
tty.c_lflag &= ~(ECHO|ECHONL|ICANON|IEXTEN);
tty.c_cflag &= ~(CSIZE|PARENB);
tty.c_cflag |= CS8;
tty.c_cc[ VMIN ] = 1;
tty.c_cc[ VTIME ] = 0;
tcsetattr( 0, TCSANOW, &tty );
#else
HANDLE h = GetStdHandle( STD_INPUT_HANDLE );
if (h) {
DWORD tty;
GetConsoleMode( h, &tty );
oldtty = tty;
SetConsoleMode( h, mode & ~( ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT ) );
}
#endif
mode = 1;
atexit( term_exit );
}
/** Check for a keypress without blocking infinitely.
Returns: ASCII value of keypress or -1 if no keypress detected.
*/
int term_read( )
{
#ifndef _WIN32
int n = 1;
unsigned char ch;
struct timeval tv;
fd_set rfds;
FD_ZERO( &rfds );
FD_SET( 0, &rfds );
tv.tv_sec = 0;
tv.tv_usec = 40000;
n = select( 1, &rfds, NULL, NULL, &tv );
if (n > 0)
{
n = read( 0, &ch, 1 );
tcflush( 0, TCIFLUSH );
if (n == 1)
return ch;
return n;
}
#else
HANDLE h = GetStdHandle( STD_INPUT_HANDLE );
if ( h && WaitForSingleObject( h, 0 ) == WAIT_OBJECT_0 )
{
DWORD count;
TCHAR c = 0;
ReadConsole( h, &c, 1, &count, NULL );
return (int) c;
} else {
struct timespec tm = { 0, 40000000 };
nanosleep( &tm, NULL );
return 0;
}
#endif
return -1;
}
char get_keypress( )
{
char value = '\0';
int pressed = 0;
fflush( stdout );
term_init( );
while ( ( pressed = term_read( ) ) == -1 ) ;
term_exit( );
value = (char)pressed;
return value;
}
void wait_for_any_key( char *message )
{
if ( message == NULL )
printf( "Press any key to continue: " );
else
printf( "%s", message );
get_keypress( );
printf( "\n\n" );
}
void beep( )
{
printf( "%c", 7 );
fflush( stdout );
}
/*
* io.h -- melt input/output
* Copyright (C) 2002-2014 Meltytech, LLC
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef _DEMO_IO_H_
#define _DEMO_IO_H_
#ifdef __cplusplus
extern "C"
{
#endif
extern char *chomp( char * );
extern char *trim( char * );
extern char *strip_quotes( char * );
extern char *get_string( char *, int, char * );
extern int *get_int( int *, int );
extern void term_init( );
extern int term_read( );
extern void term_exit( );
extern char get_keypress( );
extern void wait_for_any_key( char * );
extern void beep( );
#ifdef __cplusplus
}
#endif
#endif
......@@ -36,6 +36,11 @@ int main(int argc, char **argv)
QStringList args = app.arguments();
QStringList preargs;
QString locale;
#ifdef Q_OS_WIN
qputenv("KDE_FORK_SLAVES", "1");
QString path = qApp->applicationDirPath() + QLatin1Char(';') + qgetenv("PATH");
qputenv("PATH", path.toUtf8().constData());
#endif
if (args.count() >= 4) {
// Remove program name
args.removeFirst();
......
This diff is collapsed.
......@@ -82,22 +82,28 @@ void MltConnection::locateMeltAndProfilesPath(const QString &mltPath)
KdenliveSettings::setMltpath(profilePath);
#ifdef Q_OS_WIN
QString exeSuffix = ".exe";
QString exeSuffix = QStringLiteral(".exe");
#else
QString exeSuffix = "";
QString exeSuffix = QStringLiteral("");
#endif
QString meltPath;
if (qEnvironmentVariableIsSet("MLT_PREFIX")) {
meltPath = qgetenv("MLT_PREFIX") + QStringLiteral("/bin/melt") + exeSuffix;
} else {
meltPath = KdenliveSettings::rendererpath();
}
QString meltPath = QCoreApplication::applicationDirPath() + QStringLiteral("/kdenlive_melt") + exeSuffix;
if (!QFile::exists(meltPath)) {
meltPath = QDir::cleanPath(profilePath + QStringLiteral("/../../../bin/melt")) + exeSuffix;
meltPath = QStandardPaths::findExecutable(QStringLiteral("kdenlive_melt") + exeSuffix);
if (!QFile::exists(meltPath)) {
meltPath = QStandardPaths::findExecutable("melt");
if (qEnvironmentVariableIsSet("MLT_PREFIX")) {
meltPath = qgetenv("MLT_PREFIX") + QStringLiteral("/bin/melt") + exeSuffix;
} else {
meltPath = KdenliveSettings::rendererpath();
}
if (!QFile::exists(meltPath)) {
meltPath = QDir::cleanPath(profilePath + QStringLiteral("/../../../bin/melt")) + exeSuffix;
if (!QFile::exists(meltPath)) {
meltPath = QStandardPaths::findExecutable("melt");
}
}
}
}
qDebug() << "Using the following melt: "<<meltPath;
KdenliveSettings::setRendererpath(meltPath);
if (meltPath.isEmpty() && !qEnvironmentVariableIsSet("MLT_TESTS")) {
......