Attachment 50825 Details for Bug 40561 – partial support for Movie actions

[patch] partial support for Movie actions

0001-qt4-partial-support-for-Movie-actions.patch (text/plain), 4.88 KB, created by edward.hades on 2011-09-01 10:22:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: edward.hades

Created: 2011-09-01 10:22:36 UTC

Size: 4.88 KB

patch

obsolete

>From f342f6f9af6b172d8bd5e6b708bba95322738710 Mon Sep 17 00:00:00 2001
>From: Edward Hades <edward.hades@gmail.com>
>Date: Thu, 1 Sep 2011 17:32:49 +0200
>Subject: [PATCH] qt4: partial support for Movie actions
>
>Currently, only title-referencing actions are implemented.
>---
> qt4/src/poppler-link.cc |   30 +++++++++++++++++++++---------
> qt4/src/poppler-link.h  |   32 ++++++++++++++++++++++++++------
> qt4/src/poppler-page.cc |   36 +++++++++++++++++++++++++++---------
> 3 files changed, 74 insertions(+), 24 deletions(-)
>
>diff --git a/qt4/src/poppler-link.cc b/qt4/src/poppler-link.cc
>index 68c607a..d0e4e1c 100644
>--- a/qt4/src/poppler-link.cc
>+++ b/qt4/src/poppler-link.cc
>@@ -167,18 +167,20 @@ class LinkJavaScriptPrivate : public LinkPrivate
> 	{
> 	}
> 
>-#if 0
> class LinkMoviePrivate : public LinkPrivate
> {
> 	public:
>-		LinkMoviePrivate( const QRectF &area );
>+		LinkMoviePrivate( const QRectF &area, bool, const QString&, int, int );
>+
>+		QString title;
>+		bool useTitle;
>+		int r, g;
> };
> 
>-	LinkMoviePrivate::LinkMoviePrivate( const QRectF &area )
>-		: LinkPrivate( area )
>+	LinkMoviePrivate::LinkMoviePrivate( const QRectF &area, bool _useTitle, const QString& _title, int _r, int _g )
>+		: LinkPrivate( area ), title(_title), useTitle(_useTitle), r(_r), g(_g)
> 	{
> 	}
>-#endif
> 
> 	static void cvtUserToDev(::Page *page, double xu, double yu, int *xd, int *yd) {
> 		double ctm[6];
>@@ -567,10 +569,9 @@ class LinkMoviePrivate : public LinkPrivate
> 		return d->js;
> 	}
> 
>-#if 0
> 	// LinkMovie
>-	LinkMovie::LinkMovie( const QRectF &linkArea )
>-		: Link( *new LinkMoviePrivate( linkArea ) )
>+	LinkMovie::LinkMovie( const QRectF &linkArea, OperationType t, bool useTitle, const QString& title, int r, int g )
>+		: Link( *new LinkMoviePrivate( linkArea, useTitle, title, r, g ) ), type(t)
> 	{
> 	}
> 	
>@@ -582,6 +583,17 @@ class LinkMoviePrivate : public LinkPrivate
> 	{
> 		return Movie;
> 	}
>-#endif
> 
>+	bool LinkMovie::isTarget(MovieAnnotation *m) const
>+	{
>+		Q_D( const LinkMovie );
>+		if(d->useTitle)
>+		{
>+			return d->title == m->movieTitle();
>+		}
>+		else
>+		{
>+			return false; // TODO
>+		}
>+	}
> }
>diff --git a/qt4/src/poppler-link.h b/qt4/src/poppler-link.h
>index 1aa6d78..f80ef6c 100644
>--- a/qt4/src/poppler-link.h
>+++ b/qt4/src/poppler-link.h
>@@ -469,23 +469,43 @@ class POPPLER_QT4_EXPORT LinkJavaScript : public Link
> 	private:
> 		Q_DECLARE_PRIVATE( LinkJavaScript )
> 		Q_DISABLE_COPY( LinkJavaScript )
>-};	
>+};
>+
>+class MovieAnnotation;
> 
>-#if 0
>-/** Movie: Not yet defined -> think renaming to 'Media' link **/
> class POPPLER_QT4_EXPORT LinkMovie : public Link
>-// TODO this (Movie link)
> {
> 	public:
>-		LinkMovie( const QRectF &linkArea );
>+		enum OperationType {
>+			Play,
>+			Pause,
>+			Resume,
>+			Stop
>+		};
>+
>+		LinkMovie( const QRectF &linkArea, OperationType, bool, const QString&, int, int );
> 		~LinkMovie();
> 		LinkType linkType() const;
> 
>+		OperationType operationType() const { return type; }
>+
>+		/**
>+		* checks if this movie annotation is the link target.
>+		*
>+		* Since there is no way of referencing between objects in Poppler Qt4,
>+		* you'll have to traverse all your \p MovieAnnotation objects and check,
>+		* if the link applies to them. Start with the annotation on the page,
>+		* you've found the link on, most probably the movie is also there.
>+		*/
>+		bool isTarget(MovieAnnotation*) const;
>+
>+	protected:
>+		OperationType type;
>+
> 	private:
> 		Q_DECLARE_PRIVATE( LinkMovie )
> 		Q_DISABLE_COPY( LinkMovie )
> };
>-#endif
> 
> }
> 
>diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
>index f76700a..8ec6491 100644
>--- a/qt4/src/poppler-page.cc
>+++ b/qt4/src/poppler-page.cc
>@@ -171,15 +171,33 @@ Link* PageData::convertLinkActionToLink(::LinkAction * a, DocumentData *parentDo
>     break;
> 
>     case actionMovie:
>-/*      TODO this (Movie link)
>-          m_type = Movie;
>-          LinkMovie * m = (LinkMovie *) a;
>-          // copy Movie parameters (2 IDs and a const char *)
>-          Ref * r = m->getAnnotRef();
>-          m_refNum = r->num;
>-          m_refGen = r->gen;
>-          copyString( m_uri, m->getTitle()->getCString() );
>-*/  break;
>+    {
>+      ::LinkMovie *lm = (::LinkMovie *)a;
>+      LinkMovie::OperationType t;
>+      switch(lm->getOperation())
>+      {
>+      case ::LinkMovie::operationTypePlay:
>+          t = LinkMovie::Play;
>+          break;
>+      case ::LinkMovie::operationTypePause:
>+          t = LinkMovie::Pause;
>+          break;
>+      case ::LinkMovie::operationTypeResume:
>+          t = LinkMovie::Resume;
>+          break;
>+      case ::LinkMovie::operationTypeStop:
>+          t = LinkMovie::Stop;
>+          break;
>+      }
>+      if(lm->hasAnnotTitle())
>+        popplerLink = new LinkMovie( linkArea, t, true, UnicodeParsedString(lm->getAnnotTitle()), 0, 0 );
>+      else if(lm->hasAnnotRef())
>+      {
>+        Ref* r = lm->getAnnotRef();
>+        popplerLink = new LinkMovie( linkArea, t, true, QString(), r->num, r->gen );
>+      }
>+    }
>+    break;
> 
>     case actionUnknown:
>     break;
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 40561: 50825 | 50836 | 50838 | 51551 | 51552 | 58057 | 58118 | 58161 | 58264

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.