Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
573de01f
Commit
573de01f
authored
Jul 20, 2003
by
Olivier Teulière
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/gui/skins/*: removed useless code
parent
ac35c595
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
65 deletions
+16
-65
modules/gui/skins/src/event.cpp
modules/gui/skins/src/event.cpp
+1
-16
modules/gui/skins/src/event.h
modules/gui/skins/src/event.h
+1
-5
modules/gui/skins/src/vlcproc.cpp
modules/gui/skins/src/vlcproc.cpp
+8
-37
modules/gui/skins/src/vlcproc.h
modules/gui/skins/src/vlcproc.h
+6
-7
No files found.
modules/gui/skins/src/event.cpp
View file @
573de01f
...
...
@@ -2,7 +2,7 @@
* event.cpp: Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: event.cpp,v 1.
19 2003/06/22 12:46:49 asmax
Exp $
* $Id: event.cpp,v 1.
20 2003/07/20 20:42:23 ipkiss
Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -79,7 +79,6 @@ void Event::DestructParameters( bool force )
delete
[]
(
char
*
)
Param2
;
break
;
}
}
//---------------------------------------------------------------------------
bool
Event
::
IsEqual
(
Event
*
evt
)
...
...
@@ -159,8 +158,6 @@ unsigned int Event::GetMessageType( string Desc )
// Dialogs
else
if
(
Desc
==
"VLC_LOG_SHOW"
)
return
VLC_LOG_SHOW
;
else
if
(
Desc
==
"VLC_LOG_CLEAR"
)
return
VLC_LOG_CLEAR
;
else
if
(
Desc
==
"VLC_PREFS_SHOW"
)
return
VLC_PREFS_SHOW
;
else
if
(
Desc
==
"VLC_INFO_SHOW"
)
...
...
@@ -174,10 +171,6 @@ unsigned int Event::GetMessageType( string Desc )
else
if
(
Desc
==
"VLC_FULLSCREEN"
)
return
VLC_FULLSCREEN
;
// Network events
else
if
(
Desc
==
"VLC_NET_ADDUDP"
)
return
VLC_NET_ADDUDP
;
// Window events
else
if
(
Desc
==
"WINDOW_MOVE"
)
return
WINDOW_MOVE
;
...
...
@@ -284,10 +277,6 @@ void Event::CreateEvent()
Param2
=
GetBool
(
para1
);
break
;
case
VLC_NET_ADDUDP
:
Param2
=
atoi
(
para1
);
break
;
case
CTRL_ID_VISIBLE
:
Param1
=
(
unsigned
int
)
FindControl
(
para1
);
Param2
=
GetBool
(
para2
);
...
...
@@ -336,7 +325,6 @@ void Event::CreateEvent()
// Create shortcut
CreateShortcut
();
}
//---------------------------------------------------------------------------
GenericControl
*
Event
::
FindControl
(
string
id
)
...
...
@@ -354,7 +342,6 @@ GenericControl * Event::FindControl( string id )
}
}
return
NULL
;
}
//---------------------------------------------------------------------------
int
Event
::
GetBool
(
string
expr
)
...
...
@@ -451,12 +438,10 @@ Action::Action( intf_thread_t *_p_intf, string code )
// Free memory
delete
[]
evt
;
delete
[]
next
;
}
//---------------------------------------------------------------------------
Action
::~
Action
()
{
}
//---------------------------------------------------------------------------
bool
Action
::
SendEvent
()
...
...
modules/gui/skins/src/event.h
View file @
573de01f
...
...
@@ -2,7 +2,7 @@
* event.h: Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: event.h,v 1.1
2 2003/06/22 12:46:49 asmax
Exp $
* $Id: event.h,v 1.1
3 2003/07/20 20:42:23 ipkiss
Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -61,7 +61,6 @@ using namespace std;
#define VLC_DROP (VLC_MESSAGE + 7)
#define VLC_LOG_SHOW (VLC_MESSAGE + 20)
#define VLC_LOG_CLEAR (VLC_MESSAGE + 22)
#define VLC_PREFS_SHOW (VLC_MESSAGE + 23)
#define VLC_INFO_SHOW (VLC_MESSAGE + 24)
...
...
@@ -95,9 +94,6 @@ using namespace std;
#define VLC_PLAYLIST_ADD_FILE (VLC_MESSAGE + 301)
#define VLC_TEST_ALL_CLOSED (VLC_MESSAGE + 600)
// Network events
#define VLC_NET_ADDUDP (VLC_MESSAGE + 701)
// Window event
#define WINDOW_MOVE (VLC_WINDOW + 1)
#define WINDOW_OPEN (VLC_WINDOW + 2)
...
...
modules/gui/skins/src/vlcproc.cpp
View file @
573de01f
...
...
@@ -2,7 +2,7 @@
* vlcproc.cpp: VlcProc class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: vlcproc.cpp,v 1.4
1 2003/07/20 10:38:49 gbazin
Exp $
* $Id: vlcproc.cpp,v 1.4
2 2003/07/20 20:42:23 ipkiss
Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -46,26 +46,26 @@
//---------------------------------------------------------------------------
VlcProc
::
VlcProc
(
intf_thread_t
*
_p_intf
)
{
p_intf
=
_p_intf
;
playlist_t
*
p_playlist
=
(
playlist_t
*
)
vlc_object_find
(
p_intf
,
p_intf
=
_p_intf
;
playlist_t
*
p_playlist
=
(
playlist_t
*
)
vlc_object_find
(
p_intf
,
VLC_OBJECT_PLAYLIST
,
FIND_ANYWHERE
);
if
(
p_playlist
!=
NULL
)
{
// We want to be noticed of playlit changes
var_AddCallback
(
p_playlist
,
"intf-change"
,
RefreshCallback
,
this
);
// Raise/lower interface with middle click on vout
var_AddCallback
(
p_playlist
,
"intf-show"
,
IntfShowCallback
,
this
);
vlc_object_release
(
p_playlist
);
vlc_object_release
(
p_playlist
);
}
}
//---------------------------------------------------------------------------
VlcProc
::~
VlcProc
()
{
// Remove the refresh callback
playlist_t
*
p_playlist
=
(
playlist_t
*
)
vlc_object_find
(
p_intf
,
playlist_t
*
p_playlist
=
(
playlist_t
*
)
vlc_object_find
(
p_intf
,
VLC_OBJECT_PLAYLIST
,
FIND_ANYWHERE
);
if
(
p_playlist
!=
NULL
)
{
...
...
@@ -154,9 +154,6 @@ bool VlcProc::EventProc( Event *evt )
p_intf
->
p_sys
->
p_dialogs
->
ShowMessages
();
return
true
;
case
VLC_LOG_CLEAR
:
return
true
;
case
VLC_PREFS_SHOW
:
p_intf
->
p_sys
->
p_dialogs
->
ShowPrefs
();
return
true
;
...
...
@@ -183,10 +180,6 @@ bool VlcProc::EventProc( Event *evt )
p_intf
->
p_sys
->
p_theme
->
ChangeTaskbar
();
return
true
;
case
VLC_NET_ADDUDP
:
AddNetworkUDP
(
(
int
)
evt
->
GetParam2
()
);
return
true
;
default:
return
true
;
}
...
...
@@ -573,25 +566,3 @@ void VlcProc::ChangeVolume( unsigned int msg, long param )
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// Network
//---------------------------------------------------------------------------
void
VlcProc
::
AddNetworkUDP
(
int
port
)
{
// Build source name
char
*
s_port
=
new
char
[
5
];
sprintf
(
s_port
,
"%i"
,
port
);
string
source
=
"udp:@:"
+
(
string
)
s_port
;
delete
[]
s_port
;
playlist_Add
(
p_intf
->
p_sys
->
p_playlist
,
(
char
*
)
source
.
c_str
(),
PLAYLIST_APPEND
,
PLAYLIST_END
);
// Refresh interface !
p_intf
->
p_sys
->
p_theme
->
EvtBank
->
Get
(
"playlist_refresh"
)
->
PostSynchroMessage
();
InterfaceRefresh
();
}
//---------------------------------------------------------------------------
modules/gui/skins/src/vlcproc.h
View file @
573de01f
...
...
@@ -2,7 +2,7 @@
* vlcproc.h: VlcProc class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: vlcproc.h,v 1.
9 2003/06/24 22:26:01 asmax
Exp $
* $Id: vlcproc.h,v 1.
10 2003/07/20 20:42:23 ipkiss
Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
...
...
@@ -50,15 +50,14 @@ class VlcProc
void
MoveStream
(
long
Pos
);
void
FullScreen
();
void
ChangeVolume
(
unsigned
int
msg
,
long
param
);
void
AddNetworkUDP
(
int
port
);
static
int
RefreshCallback
(
vlc_object_t
*
p_this
,
const
char
*
psz_variable
,
vlc_value_t
old_val
,
vlc_value_t
new_val
,
static
int
RefreshCallback
(
vlc_object_t
*
p_this
,
const
char
*
psz_variable
,
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
);
static
int
IntfShowCallback
(
vlc_object_t
*
p_this
,
const
char
*
psz_variable
,
vlc_value_t
old_val
,
vlc_value_t
new_val
,
static
int
IntfShowCallback
(
vlc_object_t
*
p_this
,
const
char
*
psz_variable
,
vlc_value_t
old_val
,
vlc_value_t
new_val
,
void
*
param
);
void
InterfaceRefresh
();
void
EnabledEvent
(
string
type
,
bool
state
);
...
...
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