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
8bffbf86
Commit
8bffbf86
authored
Apr 24, 2009
by
Hugo Beauzee-Luyssen
Browse files
Restored signal/slots connection with the new names.
parent
4c4e1b46
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/MetaDataManager.cpp
View file @
8bffbf86
...
...
@@ -12,7 +12,7 @@
MetaDataManager
::
MetaDataManager
()
:
m_renderWidget
(
NULL
)
{
m_mediaPlayer
=
new
LibVLCpp
::
MediaPlayer
();
connect
(
Library
::
getInstance
(),
SIGNAL
(
new
Clip
Loaded
(
Clip
*
)
),
this
,
SLOT
(
new
Clip
Loaded
(
Clip
*
)
)
);
connect
(
Library
::
getInstance
(),
SIGNAL
(
new
Media
Loaded
(
Media
*
)
),
this
,
SLOT
(
new
Media
Loaded
(
Media
*
)
)
);
m_tmpSnapshotFilename
=
new
char
[
512
];
m_renderWidget
=
new
QWidget
();
m_mediaPlayer
->
setDrawable
(
m_renderWidget
->
winId
()
);
...
...
src/gui/LibraryWidget.cpp
View file @
8bffbf86
...
...
@@ -72,7 +72,7 @@ ListViewMediaItem* LibraryWidget::addMedia( const Media* media, Library::FileTy
return
item
;
}
void
LibraryWidget
::
clip
Removed
(
const
QUuid
&
uuid
)
void
LibraryWidget
::
media
Removed
(
const
QUuid
&
uuid
)
{
removeMedia
(
uuid
);
}
...
...
@@ -135,7 +135,7 @@ void LibraryWidget::insertNewMediasFromFileDialog( QString title, QString fil
{
// item = insertNewMedia( fileName, filetype );
// if( fileType == Library::Video )
emit
new
Clip
LoadingAsked
(
filePath
);
emit
new
Media
LoadingAsked
(
filePath
);
}
// if ( item != NULL )
// settings.setValue( "mediaLibraryDialogPath" , item->getClip()->getFileInfo()->absoluteDir().absolutePath() );
...
...
@@ -171,7 +171,7 @@ void LibraryWidget::on_pushButtonRemoveMedia_clicked()
ListViewMediaItem
*
item
=
(
ListViewMediaItem
*
)
mediaList
->
currentItem
();
if
(
!
item
)
return
;
// removeMedia( item );
emit
removing
Clip
Asked
(
item
->
getMedia
()
->
getUuid
()
);
emit
removing
Media
Asked
(
item
->
getMedia
()
->
getUuid
()
);
}
void
LibraryWidget
::
changeEvent
(
QEvent
*
e
)
...
...
src/gui/LibraryWidget.h
View file @
8bffbf86
...
...
@@ -65,7 +65,7 @@ private:
public
slots
:
void
newMediaLoaded
(
Media
*
);
void
clip
Removed
(
const
QUuid
&
);
void
media
Removed
(
const
QUuid
&
);
private
slots
:
void
on_pushButtonAddMedia_clicked
();
...
...
@@ -73,8 +73,8 @@ private slots:
signals:
// void listViewMediaAdded(Clip* clip);
void
new
Clip
LoadingAsked
(
const
QString
&
);
void
removing
Clip
Asked
(
const
QUuid
&
);
void
new
Media
LoadingAsked
(
const
QString
&
);
void
removing
Media
Asked
(
const
QUuid
&
);
};
#endif
/* !LIBRARYWIDGET_H */
src/gui/MainWindow.cpp
View file @
8bffbf86
...
...
@@ -90,24 +90,24 @@ void MainWindow::setupLibrary()
//Connecting GUI and Frontend :
connect
(
libraryWidget
,
SIGNAL
(
new
Clip
LoadingAsked
(
const
QString
&
)
),
SIGNAL
(
new
Media
LoadingAsked
(
const
QString
&
)
),
library
,
SLOT
(
new
Clip
LoadingAsked
(
const
QString
&
)
)
);
SLOT
(
new
Media
LoadingAsked
(
const
QString
&
)
)
);
connect
(
library
,
SIGNAL
(
new
Clip
Loaded
(
Clip
*
)
),
SIGNAL
(
new
Media
Loaded
(
Media
*
)
),
libraryWidget
,
SLOT
(
new
Clip
Loaded
(
Clip
*
)
)
);
SLOT
(
new
Media
Loaded
(
Media
*
)
)
);
connect
(
libraryWidget
,
SIGNAL
(
removing
Clip
Asked
(
const
QUuid
&
)
),
SIGNAL
(
removing
Media
Asked
(
const
QUuid
&
)
),
library
,
SLOT
(
removing
Clip
Asked
(
const
QUuid
&
)
)
);
SLOT
(
removing
Media
Asked
(
const
QUuid
&
)
)
);
connect
(
library
,
SIGNAL
(
clip
Removed
(
const
QUuid
&
)
),
SIGNAL
(
media
Removed
(
const
QUuid
&
)
),
libraryWidget
,
SLOT
(
clip
Removed
(
const
QUuid
&
)
)
);
SLOT
(
media
Removed
(
const
QUuid
&
)
)
);
}
void
MainWindow
::
createStatusBar
()
...
...
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