Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
3083fe22
Commit
3083fe22
authored
Jan 21, 2006
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Preparse items added through the directory access or directly to the interface (Refs:#192)
parent
f93e275d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
7 deletions
+18
-7
modules/gui/wxwidgets/dialogs.cpp
modules/gui/wxwidgets/dialogs.cpp
+5
-3
modules/gui/wxwidgets/dialogs/open.cpp
modules/gui/wxwidgets/dialogs/open.cpp
+2
-1
src/network/httpd.c
src/network/httpd.c
+2
-3
src/playlist/item-ext.c
src/playlist/item-ext.c
+9
-0
No files found.
modules/gui/wxwidgets/dialogs.cpp
View file @
3083fe22
...
...
@@ -430,11 +430,12 @@ void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
char
*
psz_utf8
=
wxFromLocale
(
paths
[
i
]
);
if
(
event
.
GetInt
()
)
playlist_Add
(
p_playlist
,
psz_utf8
,
psz_utf8
,
PLAYLIST_APPEND
|
(
i
?
0
:
PLAYLIST_GO
),
PLAYLIST_APPEND
|
(
i
?
0
:
PLAYLIST_GO
)
|
(
i
?
PLAYLIST_PREPARSE
:
0
),
PLAYLIST_END
);
else
playlist_Add
(
p_playlist
,
psz_utf8
,
psz_utf8
,
PLAYLIST_APPEND
,
PLAYLIST_END
);
PLAYLIST_APPEND
|
PLAYLIST_PREPARSE
,
PLAYLIST_END
);
wxLocaleFree
(
psz_utf8
);
}
}
...
...
@@ -460,7 +461,8 @@ void DialogsProvider::OnOpenDirectory( wxCommandEvent& event )
wxString
path
=
p_dir_dialog
->
GetPath
();
char
*
psz_utf8
=
wxFromLocale
(
path
);
playlist_Add
(
p_playlist
,
psz_utf8
,
psz_utf8
,
PLAYLIST_APPEND
|
(
event
.
GetInt
()
?
PLAYLIST_GO
:
0
),
PLAYLIST_APPEND
|
(
event
.
GetInt
()
?
PLAYLIST_GO
:
0
)
|
(
event
.
GetInt
()
?
0
:
PLAYLIST_PREPARSE
),
PLAYLIST_END
);
wxLocaleFree
(
psz_utf8
);
}
...
...
modules/gui/wxwidgets/dialogs/open.cpp
View file @
3083fe22
...
...
@@ -1200,7 +1200,8 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
}
}
playlist_AddItem
(
p_playlist
,
p_item
,
PLAYLIST_APPEND
,
PLAYLIST_END
);
playlist_AddItem
(
p_playlist
,
p_item
,
PLAYLIST_APPEND
|
PLAYLIST_PREPARSE
,
PLAYLIST_END
);
if
(
b_start
)
{
...
...
src/network/httpd.c
View file @
3083fe22
...
...
@@ -2553,7 +2553,7 @@ static void httpd_HostThread( httpd_host_t *host )
case
1
:
/* missing input - most likely */
i_state
=
HTTPD_CLIENT_TLS_HS_IN
;
break
;
case
2
:
/* missing output */
i_state
=
HTTPD_CLIENT_TLS_HS_OUT
;
break
;
...
...
@@ -2563,8 +2563,7 @@ static void httpd_HostThread( httpd_host_t *host )
if
(
fd
>=
0
)
{
httpd_client_t
*
cl
;
stats_UpdateInteger
(
host
,
"client_connections"
,
1
);
stats_UpdateInteger
(
host
,
"client_connections"
,
1
);
stats_UpdateInteger
(
host
,
"active_connections"
,
1
);
cl
=
httpd_ClientNew
(
fd
,
&
sock
,
i_sock_size
,
p_tls
);
p_tls
=
NULL
;
...
...
src/playlist/item-ext.c
View file @
3083fe22
...
...
@@ -243,6 +243,11 @@ int playlist_AddItem( playlist_t *p_playlist, playlist_item_t *p_item,
p_playlist
->
status
.
i_status
=
PLAYLIST_RUNNING
;
}
if
(
i_mode
&
PLAYLIST_PREPARSE
)
{
playlist_PreparseEnqueue
(
p_playlist
,
&
p_item
->
input
);
}
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
);
if
(
b_end
==
VLC_FALSE
)
...
...
@@ -363,6 +368,10 @@ int playlist_NodeAddItem( playlist_t *p_playlist, playlist_item_t *p_item,
}
p_playlist
->
status
.
i_status
=
PLAYLIST_RUNNING
;
}
if
(
i_mode
&
PLAYLIST_PREPARSE
)
{
playlist_PreparseEnqueue
(
p_playlist
,
&
p_item
->
input
);
}
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
);
...
...
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