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
372863b9
Commit
372863b9
authored
Feb 19, 2010
by
Hugo Beauzee-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Import: Handle errors in case libvlc send us the appropriate event.
parent
80224804
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
38 additions
and
1 deletion
+38
-1
src/Gui/import/ImportController.cpp
src/Gui/import/ImportController.cpp
+9
-0
src/Gui/import/ImportController.h
src/Gui/import/ImportController.h
+1
-0
src/LibVLCpp/VLCMediaPlayer.cpp
src/LibVLCpp/VLCMediaPlayer.cpp
+1
-0
src/LibVLCpp/VLCMediaPlayer.h
src/LibVLCpp/VLCMediaPlayer.h
+1
-0
src/Metadata/MetaDataManager.cpp
src/Metadata/MetaDataManager.cpp
+12
-1
src/Metadata/MetaDataManager.h
src/Metadata/MetaDataManager.h
+4
-0
src/Metadata/MetaDataWorker.cpp
src/Metadata/MetaDataWorker.cpp
+8
-0
src/Metadata/MetaDataWorker.h
src/Metadata/MetaDataWorker.h
+2
-0
No files found.
src/Gui/import/ImportController.cpp
View file @
372863b9
...
...
@@ -98,6 +98,9 @@ ImportController::ImportController(QWidget *parent) :
m_mediaListController
,
SLOT
(
clipAdded
(
Clip
*
)
)
);
//StackViewController
connect
(
m_stackNav
,
SIGNAL
(
previousButtonPushed
()
),
this
,
SLOT
(
restoreContext
()
)
);
connect
(
MetaDataManager
::
getInstance
(),
SIGNAL
(
failedToCompute
(
Media
*
)
),
this
,
SLOT
(
failedToLoad
(
Media
*
)
)
);
}
ImportController
::~
ImportController
()
...
...
@@ -443,3 +446,9 @@ ImportController::mediaLoaded()
}
}
void
ImportController
::
failedToLoad
(
Media
*
media
)
{
mediaDeletion
(
media
->
getUuid
()
);
}
src/Gui/import/ImportController.h
View file @
372863b9
...
...
@@ -102,6 +102,7 @@ class ImportController : public QDialog
void
treeViewClicked
(
const
QModelIndex
&
index
);
void
treeViewDoubleClicked
(
const
QModelIndex
&
index
);
void
mediaLoaded
();
void
failedToLoad
(
Media
*
media
);
signals:
void
mediaSelected
(
Media
*
);
...
...
src/LibVLCpp/VLCMediaPlayer.cpp
View file @
372863b9
...
...
@@ -119,6 +119,7 @@ void MediaPlayer::callbacks( const libvlc_event_t* ev
case
libvlc_MediaPlayerEncounteredError
:
qDebug
()
<<
"libvlc_MediaPlayerEncounteredError received."
<<
"This is not looking good..."
;
self
->
emit
errorEncountered
();
break
;
case
libvlc_MediaPlayerSeekableChanged
:
case
libvlc_MediaPlayerPausableChanged
:
...
...
src/LibVLCpp/VLCMediaPlayer.h
View file @
372863b9
...
...
@@ -80,6 +80,7 @@ namespace LibVLCpp
void
endReached
();
void
positionChanged
(
float
);
void
lengthChanged
(
qint64
);
void
errorEncountered
();
};
}
...
...
src/Metadata/MetaDataManager.cpp
View file @
372863b9
...
...
@@ -49,6 +49,9 @@ void MetaDataManager::launchComputing( Media *media )
connect
(
worker
,
SIGNAL
(
computed
()
),
this
,
SLOT
(
computingCompleted
()
),
Qt
::
DirectConnection
);
connect
(
worker
,
SIGNAL
(
failed
(
Media
*
)
),
this
,
SLOT
(
computingFailed
(
Media
*
)
),
Qt
::
DirectConnection
);
worker
->
compute
();
}
...
...
@@ -64,7 +67,15 @@ void MetaDataManager::computingCompleted()
launchComputing
(
m_mediaToCompute
.
dequeue
()
);
}
void
MetaDataManager
::
computeMediaMetadata
(
Media
*
media
)
void
MetaDataManager
::
computingFailed
(
Media
*
media
)
{
emit
failedToCompute
(
media
);
computingCompleted
();
}
void
MetaDataManager
::
computeMediaMetadata
(
Media
*
media
)
{
QMutexLocker
lock
(
m_computingMutex
);
...
...
src/Metadata/MetaDataManager.h
View file @
372863b9
...
...
@@ -56,6 +56,10 @@ class MetaDataManager : public QObject, public Singleton<MetaDataManager>
private
slots
:
void
computingCompleted
();
void
computingFailed
(
Media
*
media
);
signals:
void
failedToCompute
(
Media
*
);
};
#endif //METADATAMANAGER_H
src/Metadata/MetaDataWorker.cpp
View file @
372863b9
...
...
@@ -63,6 +63,7 @@ MetaDataWorker::compute()
m_mediaPlayer
->
setMedia
(
m_media
->
getVLCMedia
()
);
connect
(
m_mediaPlayer
,
SIGNAL
(
playing
()
),
this
,
SLOT
(
entrypointPlaying
()
),
Qt
::
QueuedConnection
);
connect
(
m_mediaPlayer
,
SIGNAL
(
errorEncountered
()
),
this
,
SLOT
(
failure
()
)
);
m_mediaPlayer
->
play
();
m_media
->
flushVolatileParameters
();
}
...
...
@@ -285,3 +286,10 @@ MetaDataWorker::addAudioValue( int value )
{
m_media
->
getAudioValues
()
->
append
(
value
);
}
void
MetaDataWorker
::
failure
()
{
emit
failed
(
m_media
);
deleteLater
();
}
src/Metadata/MetaDataWorker.h
View file @
372863b9
...
...
@@ -73,9 +73,11 @@ class MetaDataWorker : public QObject
void
entrypointPlaying
();
void
entrypointLengthChanged
(
qint64
);
void
generateAudioSpectrum
();
void
failure
();
signals:
void
computed
();
void
failed
(
Media
*
media
);
};
#endif // METADATAWORKER_H
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