Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
d93ca7c4
Commit
d93ca7c4
authored
Mar 31, 2004
by
gbazin
Browse files
* modules/gui/*: compilation fixes for the new input_item_t change.
parent
e3b7e2fe
Changes
6
Hide whitespace changes
Inline
Side-by-side
modules/gui/beos/VlcWrapper.cpp
View file @
d93ca7c4
...
...
@@ -2,7 +2,7 @@
* VlcWrapper.cpp: BeOS plugin for vlc (derived from MacOS X port)
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id
: VlcWrapper.cpp,v 1.42 2004/01/17 12:28:57 gbazin Exp
$
* $Id$
*
* Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
...
...
@@ -402,7 +402,7 @@ int VlcWrapper::PlaylistSize()
char
*
VlcWrapper
::
PlaylistItemName
(
int
i
)
{
return
p_playlist
->
pp_items
[
i
]
->
psz_name
;
return
p_playlist
->
pp_items
[
i
]
->
input
.
psz_name
;
}
int
VlcWrapper
::
PlaylistCurrent
()
...
...
@@ -707,8 +707,8 @@ VlcWrapper::PlaylistCloneItem( void* castToItem ) const
{
// make a copy of the item at index
*
copy
=
*
item
;
copy
->
psz_name
=
strdup
(
item
->
psz_name
);
copy
->
psz_uri
=
strdup
(
item
->
psz_uri
);
copy
->
input
.
psz_name
=
strdup
(
item
->
input
.
psz_name
);
copy
->
input
.
psz_uri
=
strdup
(
item
->
input
.
psz_uri
);
}
}
return
(
void
*
)
copy
;
...
...
@@ -786,7 +786,7 @@ bool VlcWrapper::IsUsingMenus()
return
false
;
}
char
*
psz_name
=
p_playlist
->
pp_items
[
p_playlist
->
i_index
]
->
psz_name
;
char
*
psz_name
=
p_playlist
->
pp_items
[
p_playlist
->
i_index
]
->
input
.
psz_name
;
if
(
!
strncmp
(
psz_name
,
"dvdplay:"
,
8
)
)
{
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
);
...
...
modules/gui/macosx/playlist.m
View file @
d93ca7c4
...
...
@@ -404,7 +404,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
vlc_mutex_lock
(
&
p_playlist
->
object_lock
);
o_current_name
=
[
NSString
stringWithUTF8String
:
p_playlist
->
pp_items
[
i_current
]
->
psz_name
];
p_playlist
->
pp_items
[
i_current
]
->
input
.
psz_name
];
o_current_author
=
[
NSString
stringWithUTF8String
:
playlist_GetInfo
(
p_playlist
,
i_current
,
_
(
"General"
),
_
(
"Author"
)
)];
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
);
...
...
@@ -665,10 +665,10 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
{
vlc_mutex_lock
(
&
p_playlist
->
object_lock
);
o_value
=
[
NSString
stringWithUTF8String
:
p_playlist
->
pp_items
[
i_row
]
->
psz_name
];
p_playlist
->
pp_items
[
i_row
]
->
input
.
psz_name
];
if
(
o_value
==
NULL
)
o_value
=
[
NSString
stringWithCString
:
p_playlist
->
pp_items
[
i_row
]
->
psz_name
];
p_playlist
->
pp_items
[
i_row
]
->
input
.
psz_name
];
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
);
}
else
if
(
[[
o_tc
identifier
]
isEqualToString
:
@"2"
]
)
...
...
modules/gui/macosx/playlistinfo.m
View file @
d93ca7c4
...
...
@@ -68,19 +68,19 @@
int
i_item
=
[
o_vlc_playlist
selectedPlaylistItem
];
[
o_uri_txt
setStringValue
:
([
NSString
stringWithUTF8String
:
p_playlist
->
pp_items
[
i_item
]
->
psz_uri
]
==
nil
)
?
pp_items
[
i_item
]
->
input
.
psz_uri
]
==
nil
)
?
[
NSString
stringWithCString
:
p_playlist
->
pp_items
[
i_item
]
->
psz_uri
]
:
pp_items
[
i_item
]
->
input
.
psz_uri
]
:
[
NSString
stringWithUTF8String
:
p_playlist
->
pp_items
[
i_item
]
->
psz_uri
]];
pp_items
[
i_item
]
->
input
.
psz_uri
]];
[
o_title_txt
setStringValue
:
([
NSString
stringWithUTF8String
:
p_playlist
->
pp_items
[
i_item
]
->
psz_name
]
==
nil
)
?
pp_items
[
i_item
]
->
input
.
psz_name
]
==
nil
)
?
[
NSString
stringWithCString
:
p_playlist
->
pp_items
[
i_item
]
->
psz_name
]
:
pp_items
[
i_item
]
->
input
.
psz_name
]
:
[
NSString
stringWithUTF8String
:
p_playlist
->
pp_items
[
i_item
]
->
psz_name
]];
pp_items
[
i_item
]
->
input
.
psz_name
]];
[
o_author_txt
setStringValue
:[
NSString
stringWithUTF8String
:
playlist_GetInfo
(
p_playlist
,
i_item
,
_
(
"General"
),
_
(
"Author"
)
)]];
...
...
@@ -108,13 +108,15 @@
if
(
p_playlist
)
{
vlc_mutex_lock
(
&
p_playlist
->
pp_items
[
i_item
]
->
lock
);
vlc_mutex_lock
(
&
p_playlist
->
pp_items
[
i_item
]
->
input
.
lock
);
p_playlist
->
pp_items
[
i_item
]
->
psz_uri
=
strdup
([[
o_uri_txt
stringValue
]
cString
]);
p_playlist
->
pp_items
[
i_item
]
->
psz_name
=
strdup
([[
o_title_txt
stringValue
]
cString
]);
p_playlist
->
pp_items
[
i_item
]
->
input
.
psz_uri
=
strdup
([[
o_uri_txt
stringValue
]
cString
]);
p_playlist
->
pp_items
[
i_item
]
->
input
.
psz_name
=
strdup
([[
o_title_txt
stringValue
]
cString
]);
playlist_ItemAddInfo
(
p_playlist
->
pp_items
[
i_item
],
_
(
"General"
),
_
(
"Author"
),
[[
o_author_txt
stringValue
]
cString
]);
vlc_mutex_unlock
(
&
p_playlist
->
pp_items
[
i_item
]
->
lock
);
vlc_mutex_unlock
(
&
p_playlist
->
pp_items
[
i_item
]
->
input
.
lock
);
val
.
b_bool
=
VLC_TRUE
;
var_Set
(
p_playlist
,
"intf-change"
,
val
);
vlc_object_release
(
p_playlist
);
...
...
@@ -206,13 +208,13 @@ static VLCInfoTreeItem *o_root_item = nil;
{
if
(
self
==
o_root_item
)
{
o_children
=
[[
NSMutableArray
alloc
]
initWithCapacity
:
p_playlist
->
pp_items
[
i_item
]
->
i_categories
];
for
(
i
=
0
;
i
<
p_playlist
->
pp_items
[
i_item
]
->
i_categories
;
i
++
)
o_children
=
[[
NSMutableArray
alloc
]
initWithCapacity
:
p_playlist
->
pp_items
[
i_item
]
->
input
.
i_categories
];
for
(
i
=
0
;
i
<
p_playlist
->
pp_items
[
i_item
]
->
input
.
i_categories
;
i
++
)
{
[
o_children
addObject
:[[
VLCInfoTreeItem
alloc
]
initWithName:
[
NSString
stringWithUTF8String
:
p_playlist
->
pp_items
[
i_item
]
->
pp_categories
[
i
]
->
psz_name
]
p_playlist
->
pp_items
[
i_item
]
->
input
.
pp_categories
[
i
]
->
psz_name
]
value:
@""
ID:
i
parent:
self
]];
...
...
@@ -221,18 +223,18 @@ static VLCInfoTreeItem *o_root_item = nil;
else
if
(
o_parent
==
o_root_item
)
{
o_children
=
[[
NSMutableArray
alloc
]
initWithCapacity
:
p_playlist
->
pp_items
[
i_item
]
->
p_playlist
->
pp_items
[
i_item
]
->
input
.
pp_categories
[
i_object_id
]
->
i_infos
];
for
(
i
=
0
;
i
<
p_playlist
->
pp_items
[
i_item
]
->
for
(
i
=
0
;
i
<
p_playlist
->
pp_items
[
i_item
]
->
input
.
pp_categories
[
i_object_id
]
->
i_infos
;
i
++
)
{
[
o_children
addObject
:[[
VLCInfoTreeItem
alloc
]
initWithName:
[
NSString
stringWithUTF8String
:
p_playlist
->
pp_items
[
i_item
]
->
p_playlist
->
pp_items
[
i_item
]
->
input
.
pp_categories
[
i_object_id
]
->
pp_infos
[
i
]
->
psz_name
]
value:
[
NSString
stringWithUTF8String
:
p_playlist
->
pp_items
[
i_item
]
->
p_playlist
->
pp_items
[
i_item
]
->
input
.
pp_categories
[
i_object_id
]
->
pp_infos
[
i
]
->
psz_value
]
ID:
i
...
...
modules/gui/macosx/vout.m
View file @
d93ca7c4
...
...
@@ -1018,7 +1018,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
vlc_mutex_lock
(
&
p_playlist
->
object_lock
);
o_title
=
[
NSMutableString
stringWithUTF8String
:
p_playlist
->
pp_items
[
p_playlist
->
i_index
]
->
psz_uri
];
p_playlist
->
pp_items
[
p_playlist
->
i_index
]
->
input
.
psz_uri
];
vlc_mutex_unlock
(
&
p_playlist
->
object_lock
);
vlc_object_release
(
p_playlist
);
...
...
modules/gui/ncurses/ncurses.c
View file @
d93ca7c4
...
...
@@ -2,7 +2,7 @@
* ncurses.c : NCurses plugin for vlc
*****************************************************************************
* Copyright (C) 2001-2004 VideoLAN
* $Id
: ncurses.c,v 1.15 2004/02/22 15:57:41 fenrir Exp
$
* $Id$
*
* Authors: Sam Hocevar <sam@zoy.org>
* Laurent Aimar <fenrir@via.ecp.fr>
...
...
@@ -933,20 +933,21 @@ static void Redraw ( intf_thread_t *p_intf, time_t *t_last_refresh )
{
attrset
(
A_REVERSE
);
}
if
(
!
strcmp
(
p_playlist
->
pp_items
[
i_item
]
->
psz_name
,
p_playlist
->
pp_items
[
i_item
]
->
psz_uri
)
)
if
(
!
strcmp
(
p_playlist
->
pp_items
[
i_item
]
->
input
.
psz_name
,
p_playlist
->
pp_items
[
i_item
]
->
input
.
psz_uri
)
)
{
mvnprintw
(
y
++
,
1
,
COLS
-
2
,
"%c %d - '%s'"
,
c
,
i_item
,
p_playlist
->
pp_items
[
i_item
]
->
psz_uri
);
p_playlist
->
pp_items
[
i_item
]
->
input
.
psz_uri
);
}
else
{
mvnprintw
(
y
++
,
1
,
COLS
-
2
,
"%c %d - '%s' (%s)"
,
c
,
i_item
,
p_playlist
->
pp_items
[
i_item
]
->
psz_uri
,
p_playlist
->
pp_items
[
i_item
]
->
psz_name
);
p_playlist
->
pp_items
[
i_item
]
->
input
.
psz_uri
,
p_playlist
->
pp_items
[
i_item
]
->
input
.
psz_name
);
}
if
(
b_selected
)
{
...
...
@@ -996,7 +997,7 @@ static void Eject ( intf_thread_t *p_intf )
return
;
}
psz_name
=
p_playlist
->
pp_items
[
p_playlist
->
i_index
]
->
psz_name
;
psz_name
=
p_playlist
->
pp_items
[
p_playlist
->
i_index
]
->
input
.
psz_name
;
if
(
psz_name
)
{
...
...
modules/gui/pda/pda_callbacks.c
View file @
d93ca7c4
...
...
@@ -2,7 +2,7 @@
* pda_callbacks.c : Callbacks for the pda Linux Gtk+ plugin.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id
: pda_callbacks.c,v 1.29 2004/02/29 22:59:59 jpsaman Exp
$
* $Id$
*
* Authors: Jean-Paul Saman <jpsaman@wxs.nl>
*
...
...
@@ -163,7 +163,7 @@ void PlaylistRebuildListStore( GtkListStore * p_list, playlist_t * p_playlist )
vlc_mutex_lock
(
&
p_playlist
->
object_lock
);
for
(
i_dummy
=
0
;
i_dummy
<
p_playlist
->
i_size
;
i_dummy
++
)
{
ppsz_text
[
0
]
=
p_playlist
->
pp_items
[
i_dummy
]
->
psz_name
;
ppsz_text
[
0
]
=
p_playlist
->
pp_items
[
i_dummy
]
->
input
.
psz_name
;
ppsz_text
[
1
]
=
"no info"
;
gtk_list_store_append
(
p_list
,
&
iter
);
gtk_list_store_set
(
p_list
,
&
iter
,
...
...
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