Commit 9256df77 authored by Radek Polak's avatar Radek Polak

gta02 - package up glamo mplayer, move xglamo to gta02 sf repo

parent 13174046
......@@ -1295,7 +1295,12 @@ PLAY:
connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), this,
SLOT(processFinished(int, QProcess::ExitStatus)));
//process->setProcessChannelMode(QProcess::ForwardedChannels);
process->start("mplayer", args, QIODevice::ReadWrite);
QString mplayerBin = "mplayer";
if(QFile::exists("/usr/bin/mplayer-glamo"))
mplayerBin = "/usr/bin/mplayer-glamo";
process->start(mplayerBin, args, QIODevice::ReadWrite);
if (process->waitForStarted(5000)) {
setpriority(PRIO_PROCESS, process->pid(), -5);
......@@ -1401,13 +1406,8 @@ bool QMplayer::installMplayer()
f.write("vo=glamo\n\n[default]\nafm=ffmpeg\nvfm=ffmpeg\n");
f.close();
return download("http://72.249.85.183/radekp/qmplayer/download/mplayer",
"/usr/bin/mplayer", "mplayer", false) &&
QFile::setPermissions("/usr/bin/mplayer", QFile::ReadOwner |
QFile::WriteOwner | QFile::ExeOwner |
QFile::ReadUser | QFile::ExeUser |
QFile::ReadGroup | QFile::ExeGroup |
QFile::ReadOther | QFile::ExeOther);
QProcess::execute("raptor", QStringList() << "-i" << "http://qtmoko.sourceforge.net/debian/gta02/armel/mplayer-glamo.deb");
return QFile::exists("/usr/bin/mplayer-glamo");
} else {
QProcess::execute("raptor", QStringList() << "-u" << "-i" << "mplayer");
......
......@@ -389,7 +389,7 @@ bool QX::checkX()
#ifdef QT_QWS_NEO
QProcess::execute("raptor", QStringList() << "-u" << "-i" << "xfonts-base" << "xterm" << "x11-xserver-utils");
QProcess::execute("raptor", QStringList() << "-i" << "http://qtmoko.sourceforge.net/download/Xglamo.deb");
QProcess::execute("raptor", QStringList() << "-i" << "http://qtmoko.sourceforge.net/debian/gta02/armel/Xglamo.deb");
#else
QProcess::execute("raptor", QStringList() << "-u" << "-i" << "xfonts-base" << "xterm" << "x11-xserver-utils" << "xserver-xfbdev");
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment