Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLMC
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
17
Issues
17
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
VLMC
Commits
dbf34a43
Commit
dbf34a43
authored
Apr 16, 2010
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Import: Don't try to import non-media files.
This makes the loading of a directory almost immediat.
parent
853aebac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
14 deletions
+5
-14
src/Gui/import/ImportController.cpp
src/Gui/import/ImportController.cpp
+4
-14
src/Gui/import/ImportController.h
src/Gui/import/ImportController.h
+1
-0
No files found.
src/Gui/import/ImportController.cpp
View file @
dbf34a43
...
...
@@ -58,12 +58,11 @@ ImportController::ImportController(QWidget *parent) :
m_filesModel
=
new
QFileSystemModel
(
this
);
m_stackNav
->
pushViewController
(
m_mediaListView
);
QStringList
filters
;
filters
<<
Media
::
AudioExtensions
.
split
(
' '
,
QString
::
SkipEmptyParts
)
m_nameFilters
<<
Media
::
AudioExtensions
.
split
(
' '
,
QString
::
SkipEmptyParts
)
<<
Media
::
VideoExtensions
.
split
(
' '
,
QString
::
SkipEmptyParts
)
<<
Media
::
ImageExtensions
.
split
(
' '
,
QString
::
SkipEmptyParts
);
m_filesModel
->
setFilter
(
QDir
::
AllDirs
|
QDir
::
AllEntries
|
QDir
::
NoDotAndDotDot
);
m_filesModel
->
setNameFilters
(
f
ilters
);
m_filesModel
->
setNameFilters
(
m_nameF
ilters
);
m_filesModel
->
setRootPath
(
"/"
);
m_filesModel
->
setNameFilterDisables
(
false
);
...
...
@@ -194,7 +193,7 @@ void
ImportController
::
importDir
(
const
QString
&
path
)
{
QDir
dir
(
path
);
QFileInfoList
files
=
dir
.
entryInfoList
(
QDir
::
NoDotAndDotDot
|
QDir
::
Readable
QFileInfoList
files
=
dir
.
entryInfoList
(
m_nameFilters
,
QDir
::
NoDotAndDotDot
|
QDir
::
Readable
|
QDir
::
AllEntries
);
foreach
(
QFileInfo
fInfo
,
files
)
...
...
@@ -202,16 +201,7 @@ ImportController::importDir( const QString &path )
if
(
fInfo
.
isDir
()
==
true
)
importDir
(
fInfo
.
absoluteFilePath
()
);
else
{
QString
ext
=
fInfo
.
suffix
();
if
(
Media
::
AudioExtensions
.
contains
(
ext
)
||
Media
::
VideoExtensions
.
contains
(
ext
)
||
Media
::
ImageExtensions
.
contains
(
ext
)
)
{
importMedia
(
fInfo
.
absoluteFilePath
()
);
}
}
importMedia
(
fInfo
.
absoluteFilePath
()
);
}
}
...
...
src/Gui/import/ImportController.h
View file @
dbf34a43
...
...
@@ -85,6 +85,7 @@ class ImportController : public QDialog
quint32
m_nbMediaToLoad
;
quint32
m_nbMediaLoaded
;
ClipRenderer
*
m_clipRenderer
;
QStringList
m_nameFilters
;
public
slots
:
void
accept
();
...
...
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