[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/Makefile.am plugin/klas...
From: |
Bastiaan Jacques |
Subject: |
[Gnash-commit] gnash ChangeLog backend/Makefile.am plugin/klas... |
Date: |
Sun, 16 Sep 2007 18:26:49 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 07/09/16 18:26:49
Modified files:
. : ChangeLog
backend : Makefile.am
plugin/klash : klash_part.cpp klash_part.h
Log message:
* plugin/klash/klash_part.{cpp,h}: Properly add URL arguments to
the Klash commandline. This enables Youtube playback in
Konqueror.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4327&r2=1.4328
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash_part.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash_part.h?cvsroot=gnash&r1=1.7&r2=1.8
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4327
retrieving revision 1.4328
diff -u -b -r1.4327 -r1.4328
--- ChangeLog 16 Sep 2007 16:48:12 -0000 1.4327
+++ ChangeLog 16 Sep 2007 18:26:49 -0000 1.4328
@@ -1,3 +1,8 @@
+2007-09-16 Bastiaan Jacques <address@hidden>
+
+ * plugin/klash/klash_part.{cpp,h}: Properly add URL arguments to
+ the Klash commandline. This enables Youtube playback in Konqueror.
+
2007-09-16 Chad Musick <address@hidden>
* libbase/string_table.cpp,.h: A string table to cut down on memory
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- backend/Makefile.am 15 Sep 2007 03:06:37 -0000 1.60
+++ backend/Makefile.am 16 Sep 2007 18:26:49 -0000 1.61
@@ -120,6 +120,8 @@
#plugins_LTLIBRARIES += libgnashogl.la
libgnashogl_la_SOURCES = render_handler_tri.cpp render_handler_ogl.cpp
#libgnashogl_la_LDFLAGS = -module -avoid-version -no-undefined
+libgnashogl_la_LDFLAGS =
+libgnashogl_la_LIBADD = $(OPENGL_LIBS)
endif
endif
Index: plugin/klash/klash_part.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash_part.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- plugin/klash/klash_part.cpp 24 Aug 2007 15:49:54 -0000 1.19
+++ plugin/klash/klash_part.cpp 16 Sep 2007 18:26:49 -0000 1.20
@@ -135,6 +135,7 @@
if (!ok)
m_autostart = (value.lower () == "false");
}
+ m_args.push_back(name + QChar('=') + value);
}
}
KParts::Part::setWidget (new KlashView (wparent));
@@ -173,21 +174,29 @@
m_process = new KProcess;
m_process->setUseShell (true);
m_process->setEnvironment (QString::fromLatin1 ("SESSION_MANAGER"),
QString::fromLatin1 (""));
- QString dim;
+
+ QString cmd = procname + QString(" -x ") +
+
QString::number(static_cast<KlashView*>(widget())->embedId());
+
if (m_width > 0 && m_height > 0)
- dim = QString ("-j ") + QString::number (m_width) +
- QString (" -k ") + QString::number (m_height);
+ cmd += QString(" -j ") + QString::number(m_width) +
+ QString(" -k ") + QString::number(m_height);
+
QString url = m_url.url();
- QString url_param;
if (!url.isEmpty())
- url_param = QString ("-u ") + KProcess::quote (url);
- QString cmd = procname + QString (" -x ") +
- QString::number (static_cast <KlashView *> (widget ())->embedId()) +
- QChar (' ') + dim +
- QChar (' ') + url_param +
- QChar (' ') + KProcess::quote (m_src_url);
+ cmd += QString(" -u ") + KProcess::quote(url);
+ url = m_docbase.url();
+ if (!url.isEmpty())
+ cmd += QString(" -U ") + KProcess::quote(url);
+
+ for (QStringList::const_iterator it=m_args.begin(), end=m_args.end();it !=
end; ++it)
+ cmd += QString(" -P ") + KProcess::quote(*it);
+
+ cmd += QString (" ") + KProcess::quote(m_src_url);
+
kdDebug () << cmd << endl;
*m_process << cmd;
+
connect (m_process, SIGNAL (processExited (KProcess *)),
this, SLOT (processStopped (KProcess *)));
m_process->start (KProcess::NotifyOnExit, KProcess::NoCommunication);
Index: plugin/klash/klash_part.h
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash_part.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- plugin/klash/klash_part.h 1 Jul 2007 10:54:15 -0000 1.7
+++ plugin/klash/klash_part.h 16 Sep 2007 18:26:49 -0000 1.8
@@ -147,6 +147,7 @@
protected:
virtual bool openFile();
private:
+ QStringList m_args;
KlashBrowserExtension * m_browserextension;
KlashLiveConnectExtension * m_liveconnectextension;
KProcess * m_process;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog backend/Makefile.am plugin/klas...,
Bastiaan Jacques <=