Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
826a00e1
Commit
826a00e1
authored
Jun 20, 2005
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* backport of [11467] and [11479]
parent
1bd45f1e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
6 deletions
+30
-6
modules/gui/macosx/playlist.m
modules/gui/macosx/playlist.m
+28
-4
modules/misc/dummy/dummy.c
modules/misc/dummy/dummy.c
+2
-2
No files found.
modules/gui/macosx/playlist.m
View file @
826a00e1
...
@@ -1069,7 +1069,14 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -1069,7 +1069,14 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
playlist_view_t
*
p_view
;
playlist_view_t
*
p_view
;
p_view
=
playlist_ViewFind
(
p_playlist
,
i_current_view
);
p_view
=
playlist_ViewFind
(
p_playlist
,
i_current_view
);
if
(
p_view
&&
p_view
->
p_root
)
if
(
p_view
&&
p_view
->
p_root
)
{
i_return
=
p_view
->
p_root
->
i_children
;
i_return
=
p_view
->
p_root
->
i_children
;
if
(
i_current_view
==
VIEW_CATEGORY
)
{
i_return
--
;
/* remove the GENERAL item from the list */
i_return
+=
p_playlist
->
p_general
->
i_children
;
/* add the items of the general node */
}
}
}
}
else
else
{
{
...
@@ -1101,8 +1108,20 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -1101,8 +1108,20 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
/* root object */
/* root object */
playlist_view_t
*
p_view
;
playlist_view_t
*
p_view
;
p_view
=
playlist_ViewFind
(
p_playlist
,
i_current_view
);
p_view
=
playlist_ViewFind
(
p_playlist
,
i_current_view
);
if
(
p_view
&&
index
<
p_view
->
p_root
->
i_children
&&
index
>=
0
)
if
(
p_view
&&
p_view
->
p_root
)
p_return
=
p_view
->
p_root
->
pp_children
[
index
];
p_return
=
p_view
->
p_root
->
pp_children
[
index
];
if
(
i_current_view
==
VIEW_CATEGORY
)
{
if
(
p_playlist
->
p_general
->
i_children
&&
index
>=
0
&&
index
<
p_playlist
->
p_general
->
i_children
)
{
p_return
=
p_playlist
->
p_general
->
pp_children
[
index
];
}
else
if
(
p_view
&&
p_view
->
p_root
&&
index
>=
0
&&
index
-
p_playlist
->
p_general
->
i_children
<
p_view
->
p_root
->
i_children
)
{
p_return
=
p_view
->
p_root
->
pp_children
[
index
-
p_playlist
->
p_general
->
i_children
+
1
];
}
}
}
}
else
else
{
{
...
@@ -1152,8 +1171,13 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
...
@@ -1152,8 +1171,13 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
/* root object */
/* root object */
playlist_view_t
*
p_view
;
playlist_view_t
*
p_view
;
p_view
=
playlist_ViewFind
(
p_playlist
,
i_current_view
);
p_view
=
playlist_ViewFind
(
p_playlist
,
i_current_view
);
if
(
p_view
&&
p_view
->
p_root
)
if
(
p_view
&&
p_view
->
p_root
)
i_return
=
p_view
->
p_root
->
i_children
;
i_return
=
p_view
->
p_root
->
i_children
;
if
(
i_current_view
==
VIEW_CATEGORY
)
{
i_return
--
;
i_return
+=
p_playlist
->
p_general
->
i_children
;
}
}
}
else
else
{
{
...
...
modules/misc/dummy/dummy.c
View file @
826a00e1
...
@@ -80,7 +80,7 @@ vlc_module_begin();
...
@@ -80,7 +80,7 @@ vlc_module_begin();
set_description
(
_
(
"Dummy decoder function"
)
);
set_description
(
_
(
"Dummy decoder function"
)
);
set_capability
(
"decoder"
,
0
);
set_capability
(
"decoder"
,
0
);
set_callbacks
(
E_
(
OpenDecoder
),
E_
(
CloseDecoder
)
);
set_callbacks
(
E_
(
OpenDecoder
),
E_
(
CloseDecoder
)
);
add_bool
(
"dummy-save-es"
,
0
,
NULL
,
SAVE_TEXT
,
SAVE_LONGTEXT
,
VLC_
FALS
E
);
add_bool
(
"dummy-save-es"
,
0
,
NULL
,
SAVE_TEXT
,
SAVE_LONGTEXT
,
VLC_
TRU
E
);
add_submodule
();
add_submodule
();
set_description
(
_
(
"Dummy encoder function"
)
);
set_description
(
_
(
"Dummy encoder function"
)
);
set_capability
(
"encoder"
,
0
);
set_capability
(
"encoder"
,
0
);
...
@@ -95,7 +95,7 @@ vlc_module_begin();
...
@@ -95,7 +95,7 @@ vlc_module_begin();
set_capability
(
"video output"
,
1
);
set_capability
(
"video output"
,
1
);
set_callbacks
(
E_
(
OpenVideo
),
NULL
);
set_callbacks
(
E_
(
OpenVideo
),
NULL
);
add_category_hint
(
N_
(
"Video"
),
NULL
,
VLC_FALSE
);
add_category_hint
(
N_
(
"Video"
),
NULL
,
VLC_FALSE
);
add_string
(
"dummy-chroma"
,
NULL
,
NULL
,
CHROMA_TEXT
,
CHROMA_LONGTEXT
,
VLC_
FALS
E
);
add_string
(
"dummy-chroma"
,
NULL
,
NULL
,
CHROMA_TEXT
,
CHROMA_LONGTEXT
,
VLC_
TRU
E
);
add_submodule
();
add_submodule
();
set_description
(
_
(
"Dummy font renderer function"
)
);
set_description
(
_
(
"Dummy font renderer function"
)
);
set_capability
(
"text renderer"
,
1
);
set_capability
(
"text renderer"
,
1
);
...
...
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