Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLMC
Commits
a2016025
Commit
a2016025
authored
Dec 10, 2009
by
Geoffroy Lacarriere
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clicking the Cancel button when metadata computing doesn't crash anymore
parent
d1c990a3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
2 deletions
+18
-2
src/GUI/ImportMediaListController.cpp
src/GUI/ImportMediaListController.cpp
+8
-1
src/GUI/ImportMediaListController.h
src/GUI/ImportMediaListController.h
+1
-0
src/Media/Media.cpp
src/Media/Media.cpp
+6
-0
src/Media/Media.h
src/Media/Media.h
+3
-1
No files found.
src/GUI/ImportMediaListController.cpp
View file @
a2016025
...
...
@@ -54,7 +54,14 @@ void ImportMediaListController::metaDataComputed( Media* media )
ImportMediaCellView
*
ImportMediaListController
::
getCell
(
QUuid
uuid
)
const
{
return
m_mediaCellList
->
value
(
uuid
);
if
(
m_mediaCellList
->
contains
(
uuid
)
)
return
m_mediaCellList
->
value
(
uuid
);
return
NULL
;
}
bool
ImportMediaListController
::
contains
(
QUuid
uuid
)
{
return
m_mediaCellList
->
contains
(
uuid
);
}
void
ImportMediaListController
::
removeMedia
(
const
QUuid
&
uuid
)
...
...
src/GUI/ImportMediaListController.h
View file @
a2016025
...
...
@@ -46,6 +46,7 @@ class ImportMediaListController : public ListViewController
const
QHash
<
QUuid
,
ImportMediaCellView
*>*
getMediaCellList
()
const
{
return
m_mediaCellList
;
}
ImportMediaCellView
*
getCell
(
QUuid
uuid
)
const
;
bool
contains
(
QUuid
uuid
);
private:
StackViewController
*
m_nav
;
...
...
src/Media/Media.cpp
View file @
a2016025
...
...
@@ -205,6 +205,12 @@ void Media::emitSnapshotComputed()
emit
snapshotComputed
(
this
);
}
void
Media
::
emitAudioSpectrumComuted
()
{
m_metadataState
=
ParsedWithAudioSpectrum
;
emit
audioSpectrumComputed
(
this
);
}
Media
::
InputType
Media
::
getInputType
()
const
{
return
m_inputType
;
...
...
src/Media/Media.h
View file @
a2016025
...
...
@@ -69,7 +69,8 @@ public:
{
None
,
ParsedWithoutSnapshot
,
ParsedWithSnapshot
ParsedWithSnapshot
,
ParsedWithAudioSpectrum
};
Media
(
const
QString
&
filePath
,
const
QString
&
uuid
=
QString
()
);
virtual
~
Media
();
...
...
@@ -133,6 +134,7 @@ public:
void
emitMetaDataComputed
(
bool
hasMetadata
);
void
emitSnapshotComputed
();
void
emitAudioSpectrumComuted
();
// bool hasMetadata() const;
MetadataState
getMetadata
()
const
;
...
...
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