Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
43e94311
Commit
43e94311
authored
Dec 19, 2004
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bugs with psz_shortname
parent
7231885d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
12 deletions
+17
-12
modules/gui/wxwindows/open.cpp
modules/gui/wxwindows/open.cpp
+8
-4
modules/gui/wxwindows/playlist.cpp
modules/gui/wxwindows/playlist.cpp
+4
-4
src/interface/interface.c
src/interface/interface.c
+4
-3
src/misc/modules.c
src/misc/modules.c
+1
-1
No files found.
modules/gui/wxwindows/open.cpp
View file @
43e94311
...
...
@@ -477,7 +477,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
AutoBuiltPanel
*
autopanel
=
new
AutoBuiltPanel
(
notebook
,
this
,
p_intf
,
p_module
);
input_tab_array
.
Add
(
autopanel
);
notebook
->
AddPage
(
autopanel
,
wxU
(
p_module
->
psz_shortname
),
notebook
->
AddPage
(
autopanel
,
wxU
(
p_module
->
psz_shortname
?
p_module
->
psz_shortname
:
p_module
->
psz_object_name
),
i_access_method
==
CAPTURE_ACCESS
);
}
...
...
@@ -487,7 +488,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
AutoBuiltPanel
*
autopanel
=
new
AutoBuiltPanel
(
notebook
,
this
,
p_intf
,
p_module
);
input_tab_array
.
Add
(
autopanel
);
notebook
->
AddPage
(
autopanel
,
wxU
(
p_module
->
psz_shortname
),
notebook
->
AddPage
(
autopanel
,
wxU
(
p_module
->
psz_shortname
?
p_module
->
psz_shortname
:
p_module
->
psz_object_name
),
i_access_method
==
CAPTURE_ACCESS
);
}
...
...
@@ -497,7 +499,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
AutoBuiltPanel
*
autopanel
=
new
AutoBuiltPanel
(
notebook
,
this
,
p_intf
,
p_module
);
input_tab_array
.
Add
(
autopanel
);
notebook
->
AddPage
(
autopanel
,
wxU
(
p_module
->
psz_shortname
),
notebook
->
AddPage
(
autopanel
,
wxU
(
p_module
->
psz_shortname
?
p_module
->
psz_shortname
:
p_module
->
psz_object_name
),
i_access_method
==
CAPTURE_ACCESS
);
}
...
...
@@ -507,7 +510,8 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
AutoBuiltPanel
*
autopanel
=
new
AutoBuiltPanel
(
notebook
,
this
,
p_intf
,
p_module
);
input_tab_array
.
Add
(
autopanel
);
notebook
->
AddPage
(
autopanel
,
wxU
(
p_module
->
psz_shortname
),
notebook
->
AddPage
(
autopanel
,
wxU
(
p_module
->
psz_shortname
?
p_module
->
psz_shortname
:
p_module
->
psz_object_name
),
i_access_method
==
CAPTURE_ACCESS
);
}
...
...
modules/gui/wxwindows/playlist.cpp
View file @
43e94311
...
...
@@ -1383,16 +1383,17 @@ wxMenu *Playlist::SDMenu()
{
p_sd_menu
->
AppendCheckItem
(
FirstSD_Event
+
i_number
,
wxU
(
p_parser
->
psz_longname
?
p_parser
->
psz_longname
:
p_parser
->
psz_shortname
)
);
(
p_parser
->
psz_shortname
?
p_parser
->
psz_shortname
:
p_parser
->
psz_object_name
))
);
if
(
playlist_IsServicesDiscoveryLoaded
(
p_playlist
,
p_parser
->
psz_
short
name
)
)
p_parser
->
psz_
object_
name
)
)
{
p_sd_menu
->
Check
(
FirstSD_Event
+
i_number
,
TRUE
);
}
INSERT_ELEM
(
(
void
**
)
pp_sds
,
i_number
,
i_number
,
(
void
*
)
p_parser
->
psz_
short
name
);
(
void
*
)
p_parser
->
psz_
object_
name
);
}
}
vlc_list_release
(
p_list
);
...
...
@@ -1424,7 +1425,6 @@ void Playlist::OnPopup( wxContextMenuEvent& event )
else
Playlist
::
PopupMenu
(
node_popup
,
ScreenToClient
(
wxGetMousePosition
()
)
);
}
}
...
...
src/interface/interface.c
View file @
43e94311
...
...
@@ -156,13 +156,14 @@ int intf_RunThread( intf_thread_t *p_intf )
}
}
if
(
p_intf
->
b_block
&&
strncmp
(
p_intf
->
p_module
->
psz_shortname
,
"clivlc"
,
6
)
)
if
(
p_intf
->
b_block
&&
strncmp
(
p_intf
->
p_module
->
psz_object_name
,
"clivlc"
,
6
)
)
{
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
[
VLCApplication
sharedApplication
];
[
VLCApplication
sharedApplication
];
}
if
(
p_intf
->
b_block
&&
(
!
strncmp
(
p_intf
->
p_module
->
psz_
short
name
,
"macosx"
,
6
)
||
if
(
p_intf
->
b_block
&&
(
!
strncmp
(
p_intf
->
p_module
->
psz_
object_
name
,
"macosx"
,
6
)
||
!
strncmp
(
p_intf
->
p_vlc
->
psz_object_name
,
"clivlc"
,
6
)
)
)
{
/* VLC in normal primary interface mode */
...
...
src/misc/modules.c
View file @
43e94311
...
...
@@ -1165,7 +1165,7 @@ static void UndupModule( module_t *p_module )
free
(
p_module
->
psz_object_name
);
free
(
p_module
->
psz_capability
);
free
(
p_module
->
psz_shortname
);
if
(
p_module
->
psz_shortname
)
free
(
p_module
->
psz_shortname
);
free
(
p_module
->
psz_longname
);
if
(
p_module
->
psz_program
!=
NULL
)
...
...
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