Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
1fef4deb
Commit
1fef4deb
authored
May 14, 2005
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code simplification
parent
25722492
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
11 deletions
+5
-11
modules/gui/wxwindows/interface.cpp
modules/gui/wxwindows/interface.cpp
+5
-11
No files found.
modules/gui/wxwindows/interface.cpp
View file @
1fef4deb
...
@@ -94,7 +94,6 @@ public:
...
@@ -94,7 +94,6 @@ public:
wxVolCtrl
*
gauge
;
wxVolCtrl
*
gauge
;
int
i_y_offset
;
int
i_y_offset
;
vlc_bool_t
b_mute
;
intf_thread_t
*
p_intf
;
intf_thread_t
*
p_intf
;
};
};
...
@@ -1427,7 +1426,7 @@ VLCVolCtrl::VLCVolCtrl( intf_thread_t *_p_intf, wxWindow *p_parent )
...
@@ -1427,7 +1426,7 @@ VLCVolCtrl::VLCVolCtrl( intf_thread_t *_p_intf, wxWindow *p_parent )
:
wxControl
(
p_parent
,
-
1
,
wxDefaultPosition
,
wxSize
(
64
,
VLCVOL_HEIGHT
),
:
wxControl
(
p_parent
,
-
1
,
wxDefaultPosition
,
wxSize
(
64
,
VLCVOL_HEIGHT
),
wxBORDER_NONE
),
wxBORDER_NONE
),
i_y_offset
((
VLCVOL_HEIGHT
-
TOOLBAR_BMP_HEIGHT
)
/
2
),
i_y_offset
((
VLCVOL_HEIGHT
-
TOOLBAR_BMP_HEIGHT
)
/
2
),
b_mute
(
0
),
p_intf
(
_p_intf
)
p_intf
(
_p_intf
)
{
{
gauge
=
new
wxVolCtrl
(
p_intf
,
this
,
-
1
,
wxPoint
(
18
,
i_y_offset
),
gauge
=
new
wxVolCtrl
(
p_intf
,
this
,
-
1
,
wxPoint
(
18
,
i_y_offset
),
wxSize
(
44
,
TOOLBAR_BMP_HEIGHT
)
);
wxSize
(
44
,
TOOLBAR_BMP_HEIGHT
)
);
...
@@ -1435,8 +1434,11 @@ VLCVolCtrl::VLCVolCtrl( intf_thread_t *_p_intf, wxWindow *p_parent )
...
@@ -1435,8 +1434,11 @@ VLCVolCtrl::VLCVolCtrl( intf_thread_t *_p_intf, wxWindow *p_parent )
void
VLCVolCtrl
::
OnPaint
(
wxPaintEvent
&
evt
)
void
VLCVolCtrl
::
OnPaint
(
wxPaintEvent
&
evt
)
{
{
int
i_volume
;
i_volume
=
(
audio_volume_t
)
config_GetInt
(
p_intf
,
"volume"
);
wxPaintDC
dc
(
this
);
wxPaintDC
dc
(
this
);
wxBitmap
mPlayBitmap
(
b_mute
?
speaker_mute_xpm
:
speaker
_xpm
);
wxBitmap
mPlayBitmap
(
i_volume
?
speaker_xpm
:
speaker_mute
_xpm
);
dc
.
DrawBitmap
(
mPlayBitmap
,
0
,
i_y_offset
,
TRUE
);
dc
.
DrawBitmap
(
mPlayBitmap
,
0
,
i_y_offset
,
TRUE
);
}
}
...
@@ -1446,20 +1448,12 @@ void VLCVolCtrl::OnChange( wxMouseEvent& event )
...
@@ -1446,20 +1448,12 @@ void VLCVolCtrl::OnChange( wxMouseEvent& event )
{
{
int
i_volume
;
int
i_volume
;
aout_VolumeMute
(
p_intf
,
(
audio_volume_t
*
)
&
i_volume
);
aout_VolumeMute
(
p_intf
,
(
audio_volume_t
*
)
&
i_volume
);
i_volume
=
(
audio_volume_t
)
config_GetInt
(
p_intf
,
"volume"
);
if
(
i_volume
==
0
)
b_mute
=
1
;
else
b_mute
=
0
;
Refresh
();
}
}
}
}
void
VLCVolCtrl
::
UpdateVolume
()
void
VLCVolCtrl
::
UpdateVolume
()
{
{
int
i_volume
;
gauge
->
UpdateVolume
();
gauge
->
UpdateVolume
();
i_volume
=
(
audio_volume_t
)
config_GetInt
(
p_intf
,
"volume"
);
if
(
i_volume
==
0
)
b_mute
=
1
;
else
b_mute
=
0
;
Refresh
();
Refresh
();
}
}
...
...
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