Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLMC
Commits
d8eace07
Commit
d8eace07
authored
Jan 14, 2010
by
Clement CHAVANCE
Browse files
The previewWidget is now notified that a clip have been selected
parent
5016b1fa
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/Gui/MainWindow.cpp
View file @
d8eace07
...
...
@@ -168,6 +168,9 @@ void MainWindow::setupLibrary()
connect
(
mediaLibraryWidget
,
SIGNAL
(
importRequired
()
),
this
,
SLOT
(
on_actionImport_triggered
()
)
);
connect
(
m_clipPreview
,
SIGNAL
(
addClip
(
Clip
*
)
),
mediaLibraryWidget
,
SLOT
(
clipAdded
(
Clip
*
)
)
);
connect
(
mediaLibraryWidget
,
SIGNAL
(
previewClipSetted
(
Clip
*
)
),
m_clipPreview
->
getGenericRenderer
(),
SLOT
(
setClip
(
Clip
*
)
)
);
}
void
MainWindow
::
on_actionSave_triggered
()
...
...
src/Gui/library/MediaLibraryWidget.cpp
View file @
d8eace07
...
...
@@ -38,7 +38,7 @@ MediaLibraryWidget::MediaLibraryWidget( QWidget* parent ) : QWidget( parent )
connect
(
library
,
SIGNAL
(
mediaRemoved
(
QUuid
)
),
list
,
SLOT
(
mediaRemoved
(
const
QUuid
&
)
)
);
connect
(
m_nav
,
SIGNAL
(
importRequired
()
),
this
,
SIGNAL
(
importRequired
()
)
);
//Clip
//
connect( list, SIGNAL( clipSelected( Clip*
clip
) ), this, SIGNAL(
c
lipSe
lec
ted( Clip* ) ) );
connect
(
list
,
SIGNAL
(
clipSelected
(
Clip
*
)
),
this
,
SIGNAL
(
previewC
lipSe
t
ted
(
Clip
*
)
)
);
connect
(
this
,
SIGNAL
(
addClipToViewController
(
Clip
*
)
),
list
,
SLOT
(
newClipAdded
(
Clip
*
)
)
);
m_nav
->
pushViewController
(
list
);
}
...
...
@@ -66,5 +66,4 @@ void MediaLibraryWidget::mediaSelection( Media* media )
void
MediaLibraryWidget
::
clipSelection
(
Clip
*
clip
)
{
emit
clipSelected
(
clip
);
}
src/Gui/library/MediaLibraryWidget.h
View file @
d8eace07
...
...
@@ -51,7 +51,7 @@ private slots:
signals:
void
mediaSelected
(
Media
*
media
);
void
c
lipSe
lec
ted
(
Clip
*
clip
);
void
previewC
lipSe
t
ted
(
Clip
*
clip
);
void
importRequired
();
void
addClipToViewController
(
Clip
*
clip
);
};
...
...
src/Gui/library/MediaListViewController.cpp
View file @
d8eace07
...
...
@@ -106,11 +106,9 @@ void MediaListViewController::showClipList( const QUuid& uuid )
{
if
(
!
m_cells
->
contains
(
uuid
)
)
return
;
qDebug
()
<<
"nb clips :"
<<
Library
::
getInstance
()
->
media
(
uuid
)
->
clips
()
->
size
();
if
(
Library
::
getInstance
()
->
media
(
uuid
)
==
NULL
||
Library
::
getInstance
()
->
media
(
uuid
)
->
clips
()
->
size
()
==
0
)
return
;
qDebug
()
<<
"uuid"
<<
uuid
<<
"lastUuid"
<<
m_lastUuidClipListAsked
;
if
(
m_lastUuidClipListAsked
!=
uuid
)
{
m_lastUuidClipListAsked
=
uuid
;
...
...
@@ -119,7 +117,7 @@ void MediaListViewController::showClipList( const QUuid& uuid )
m_clipsListView
=
new
ClipListViewController
(
m_nav
,
uuid
);
m_clipsListView
->
addClipsFromMedia
(
Library
::
getInstance
()
->
media
(
uuid
)
);
connect
(
m_clipsListView
,
SIGNAL
(
clipSelected
(
const
QUuid
&
)
),
this
,
S
IGNAL
(
clipSelect
ed
(
const
QUuid
&
)
)
);
this
,
S
LOT
(
clipSelect
ion
(
const
QUuid
&
)
)
);
}
m_nav
->
pushViewController
(
m_clipsListView
);
}
...
...
@@ -140,10 +138,8 @@ void MediaListViewController::newClipAdded( Clip* clip )
void
MediaListViewController
::
restoreContext
()
{
qDebug
()
<<
"current uuid"
<<
m_currentUuid
;
if
(
m_clipsListView
->
getNbDeletion
()
!=
0
)
{
qDebug
()
<<
"cells :"
<<
m_cells
;
if
(
m_cells
->
contains
(
m_currentUuid
)
)
{
MediaCellView
*
cell
=
dynamic_cast
<
MediaCellView
*>
(
m_cells
->
value
(
m_currentUuid
,
0
)
);
...
...
@@ -152,3 +148,12 @@ void MediaListViewController::restoreContext()
}
}
}
void
MediaListViewController
::
clipSelection
(
const
QUuid
&
uuid
)
{
Clip
*
clip
;
if
(
(
clip
=
Library
::
getInstance
()
->
clip
(
m_currentUuid
,
uuid
)
)
!=
0
)
emit
clipSelected
(
clip
);
}
src/Gui/library/MediaListViewController.h
View file @
d8eace07
...
...
@@ -33,12 +33,14 @@ public slots:
void
updateCell
(
Media
*
media
);
void
showClipList
(
const
QUuid
&
uuid
);
void
newClipAdded
(
Clip
*
clip
);
void
clipSelection
(
const
QUuid
&
uuid
);
private
slots
:
void
restoreContext
();
signals:
void
mediaSelected
(
Media
*
media
);
void
mediaDeleted
(
const
QUuid
&
uuid
);
void
clipSelected
(
Clip
*
clip
);
};
#endif // MEDIALISTVIEWCONTROLLER_H
src/Renderer/ClipRenderer.cpp
View file @
d8eace07
...
...
@@ -73,6 +73,7 @@ void ClipRenderer::setMedia( Media* media )
void
ClipRenderer
::
setClip
(
Clip
*
clip
)
{
qDebug
()
<<
"Setting clip"
;
if
(
clip
==
NULL
)
{
m_selectedMedia
=
NULL
;
...
...
@@ -107,7 +108,7 @@ void ClipRenderer::startPreview()
m_mediaPlayer
->
setMedia
(
m_vlcMedia
);
m_mediaPlayer
->
play
();
m_mediaPlayer
->
setPosition
(
m_begin
/
m_
end
);
m_mediaPlayer
->
setPosition
(
m_begin
/
m_
selectedMedia
->
getNbFrames
()
);
m_clipLoaded
=
true
;
m_isRendering
=
true
;
m_paused
=
false
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment