[vlmc-devel] commit: Revert "Fix a deadlock when resizing" (Ludovic Fauvet )

git at videolan.org git at videolan.org
Fri Mar 19 11:49:04 CET 2010


vlmc | branch: master | Ludovic Fauvet <etix at l0cal.com> | Fri Mar 19 11:46:13 2010 +0100| [9ffcb9f4eb7f1712c20a97c9683a74d386bf8345] | committer: Ludovic Fauvet 

Revert "Fix a deadlock when resizing"

Introduce a bug when spliting clip.
This reverts commit 79f53cd787a30f20e28f6c13361491e129eab735.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=9ffcb9f4eb7f1712c20a97c9683a74d386bf8345
---

 src/Gui/timeline/GraphicsAudioItem.cpp |    4 +---
 src/Gui/timeline/GraphicsMovieItem.cpp |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Gui/timeline/GraphicsAudioItem.cpp b/src/Gui/timeline/GraphicsAudioItem.cpp
index 4058137..e40ed8a 100644
--- a/src/Gui/timeline/GraphicsAudioItem.cpp
+++ b/src/Gui/timeline/GraphicsAudioItem.cpp
@@ -47,9 +47,7 @@ GraphicsAudioItem::GraphicsAudioItem( Clip* clip ) : m_clip( clip )
     // Adjust the width
     setWidth( clip->length() );
     // Automatically adjust future changes
-    connect( clip, SIGNAL( lengthUpdated() ),
-             this, SLOT( adjustLength() ),
-             Qt::QueuedConnection );
+    connect( clip, SIGNAL( lengthUpdated() ), this, SLOT( adjustLength() ) );
 }
 
 GraphicsAudioItem::~GraphicsAudioItem()
diff --git a/src/Gui/timeline/GraphicsMovieItem.cpp b/src/Gui/timeline/GraphicsMovieItem.cpp
index 848e452..3ed591b 100644
--- a/src/Gui/timeline/GraphicsMovieItem.cpp
+++ b/src/Gui/timeline/GraphicsMovieItem.cpp
@@ -48,9 +48,7 @@ GraphicsMovieItem::GraphicsMovieItem( Clip* clip ) : m_clip( clip )
     // Adjust the width
     setWidth( clip->length() );
     // Automatically adjust for future changes
-    connect( clip, SIGNAL( lengthUpdated() ),
-             this, SLOT( adjustLength() ),
-             Qt::QueuedConnection );
+    connect( clip, SIGNAL( lengthUpdated() ), this, SLOT( adjustLength() ) );
 }
 
 GraphicsMovieItem::~GraphicsMovieItem()



More information about the Vlmc-devel mailing list