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
d215f2b3
Commit
d215f2b3
authored
Feb 01, 2003
by
Olivier Teulière
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/gui/win32/win32.cpp: fixed a stupid bug (closes #155)
* modules/gui/win32/menu.cpp: removed some ^M chars
parent
c11c3943
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
48 deletions
+48
-48
modules/gui/win32/menu.cpp
modules/gui/win32/menu.cpp
+46
-46
modules/gui/win32/win32.cpp
modules/gui/win32/win32.cpp
+2
-2
No files found.
modules/gui/win32/menu.cpp
View file @
d215f2b3
...
...
@@ -2,7 +2,7 @@
* menu.cpp: functions to handle menu items
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: menu.cpp,v 1.1
1 2003/01/27 17:41:01
ipkiss Exp $
* $Id: menu.cpp,v 1.1
2 2003/02/01 22:21:44
ipkiss Exp $
*
* Authors: Olivier Teuliere <ipkiss@via.ecp.fr>
*
...
...
@@ -86,39 +86,39 @@ void __fastcall TMenusGen::VoutVarClick( TObject *Sender )
}
/*
* Modules
*/
/* Interface modules: we spawn a new interface */
void
__fastcall
TMenusGen
::
InterfaceModuleClick
(
TObject
*
Sender
)
{
TMenuItem
*
Item
=
(
TMenuItem
*
)
Sender
;
AnsiString
IntfName
=
CleanCaption
(
Item
->
Caption
);
intf_thread_t
*
p_newintf
;
char
*
psz_oldmodule
=
config_GetPsz
(
p_intf
->
p_vlc
,
"intf"
);
config_PutPsz
(
p_intf
->
p_vlc
,
"intf"
,
IntfName
.
c_str
()
);
p_newintf
=
intf_Create
(
p_intf
->
p_vlc
);
config_PutPsz
(
p_intf
->
p_vlc
,
"intf"
,
psz_oldmodule
);
if
(
psz_oldmodule
)
{
free
(
psz_oldmodule
);
}
if
(
p_newintf
)
{
p_newintf
->
b_block
=
VLC_FALSE
;
if
(
intf_RunThread
(
p_newintf
)
)
{
vlc_object_detach
(
p_newintf
);
intf_Destroy
(
p_newintf
);
}
}
}
* Modules
*/
/* Interface modules: we spawn a new interface */
void
__fastcall
TMenusGen
::
InterfaceModuleClick
(
TObject
*
Sender
)
{
TMenuItem
*
Item
=
(
TMenuItem
*
)
Sender
;
AnsiString
IntfName
=
CleanCaption
(
Item
->
Caption
);
intf_thread_t
*
p_newintf
;
char
*
psz_oldmodule
=
config_GetPsz
(
p_intf
->
p_vlc
,
"intf"
);
config_PutPsz
(
p_intf
->
p_vlc
,
"intf"
,
IntfName
.
c_str
()
);
p_newintf
=
intf_Create
(
p_intf
->
p_vlc
);
config_PutPsz
(
p_intf
->
p_vlc
,
"intf"
,
psz_oldmodule
);
if
(
psz_oldmodule
)
{
free
(
psz_oldmodule
);
}
if
(
p_newintf
)
{
p_newintf
->
b_block
=
VLC_FALSE
;
if
(
intf_RunThread
(
p_newintf
)
)
{
vlc_object_detach
(
p_newintf
);
intf_Destroy
(
p_newintf
);
}
}
}
/*
* Audio
*/
...
...
@@ -502,18 +502,18 @@ int __fastcall TMenusGen::Pos2Data( int title, int chapter )
}
/* This function deletes all the '&' characters in the caption string,
* because Borland automatically adds one when (and only when!) you click on
* the menuitem. Grrrrr... */
AnsiString
__fastcall
TMenusGen
::
CleanCaption
(
AnsiString
Caption
)
{
while
(
Caption
.
LastDelimiter
(
"&"
)
!=
0
)
{
Caption
.
Delete
(
Caption
.
LastDelimiter
(
"&"
),
1
);
}
return
Caption
;
}
* because Borland automatically adds one when (and only when!) you click on
* the menuitem. Grrrrr... */
AnsiString
__fastcall
TMenusGen
::
CleanCaption
(
AnsiString
Caption
)
{
while
(
Caption
.
LastDelimiter
(
"&"
)
!=
0
)
{
Caption
.
Delete
(
Caption
.
LastDelimiter
(
"&"
),
1
);
}
return
Caption
;
}
/****************************************************************************
* VarChange: change a variable in a vlc_object_t
****************************************************************************
...
...
modules/gui/win32/win32.cpp
View file @
d215f2b3
...
...
@@ -2,7 +2,7 @@
* win32.cpp : Win32 interface plugin for vlc
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: win32.cpp,v 1.1
3 2003/01/26 02:22:59
ipkiss Exp $
* $Id: win32.cpp,v 1.1
4 2003/02/01 22:21:44
ipkiss Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
*
...
...
@@ -268,7 +268,7 @@ int Win32Manage( intf_thread_t *p_intf )
if
(
b_need_menus
)
{
//
p_intf->p_sys->p_menus->SetupMenus();
p_intf
->
p_sys
->
p_menus
->
SetupMenus
();
}
vlc_mutex_unlock
(
&
p_input
->
stream
.
stream_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