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
30d4fa34
Commit
30d4fa34
authored
Dec 30, 2009
by
Clement CHAVANCE
Browse files
Clip added from the mainWindow are now added to the library
parent
aff0ecd0
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/GUI/MainWindow.cpp
View file @
30d4fa34
...
...
@@ -167,6 +167,8 @@ void MainWindow::setupLibrary()
m_clipPreview
->
getGenericRenderer
(),
SLOT
(
mediaUnloaded
(
QUuid
)
)
);
connect
(
mediaLibraryWidget
,
SIGNAL
(
importRequired
()
),
this
,
SLOT
(
on_actionImport_triggered
()
)
);
connect
(
m_clipPreview
,
SIGNAL
(
addClip
(
Clip
*
)
),
mediaLibraryWidget
,
SLOT
(
clipAdded
(
Clip
*
)
)
);
}
void
MainWindow
::
on_actionSave_triggered
()
...
...
src/GUI/PreviewWidget.cpp
View file @
30d4fa34
...
...
@@ -193,5 +193,6 @@ void PreviewWidget::createNewClipFromMarkers()
//Adding the newly created clip to the media
selectedMedia
->
addClip
(
part
);
emit
addClip
(
part
);
return
;
}
src/GUI/PreviewWidget.h
View file @
30d4fa34
...
...
@@ -70,6 +70,9 @@ private slots:
void
markerStartClicked
();
void
markerStopClicked
();
void
createNewClipFromMarkers
();
signals:
void
addClip
(
Clip
*
clip
);
};
#endif // PREVIEWWIDGET_H
src/GUI/library/MediaLibraryWidget.cpp
View file @
30d4fa34
...
...
@@ -53,6 +53,11 @@ const ViewController* MediaLibraryWidget::getCurrentViewController()
return
m_nav
->
getCurrentViewController
();
}
void
MediaLibraryWidget
::
clipAdded
(
Clip
*
clip
)
{
Library
::
getInstance
()
->
addClip
(
clip
);
}
void
MediaLibraryWidget
::
mediaSelection
(
Media
*
media
)
{
emit
mediaSelected
(
media
);
...
...
src/GUI/library/MediaLibraryWidget.h
View file @
30d4fa34
...
...
@@ -42,6 +42,9 @@ public:
private:
StackViewController
*
m_nav
;
public
slots
:
void
clipAdded
(
Clip
*
clip
);
private
slots
:
void
mediaSelection
(
Media
*
media
);
void
clipSelection
(
Clip
*
clip
);
...
...
src/Library/Library.cpp
View file @
30d4fa34
...
...
@@ -135,6 +135,11 @@ void Library::addMedia( Media* media )
metaDataComputed
(
media
);
}
void
Library
::
addClip
(
Clip
*
clip
)
{
m_clips
[
clip
->
getUuid
()]
=
clip
;
}
void
Library
::
loadMedia
(
const
QString
&
path
,
const
QUuid
&
uuid
)
{
Media
*
it
;
...
...
src/Library/Library.h
View file @
30d4fa34
...
...
@@ -55,6 +55,7 @@ public:
*/
void
addMedia
(
Media
*
media
);
void
deleteMedia
(
Media
*
media
);
void
addClip
(
Clip
*
clip
);
private:
Library
();
...
...
Write
Preview
Markdown
is supported
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