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
fc63146c
Commit
fc63146c
authored
Sep 08, 2007
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds a pause pixmap for the play/pause button
Fix play/pause toggle Removes 2 unused signals
parent
2cc0e51d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
18 deletions
+5
-18
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+3
-10
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+1
-6
modules/gui/qt4/input_manager.hpp
modules/gui/qt4/input_manager.hpp
+0
-2
modules/gui/qt4/pixmaps/pause.png
modules/gui/qt4/pixmaps/pause.png
+0
-0
modules/gui/qt4/res.qrc
modules/gui/qt4/res.qrc
+1
-0
No files found.
modules/gui/qt4/components/interface_widgets.cpp
View file @
fc63146c
...
@@ -586,19 +586,12 @@ void ControlsWidget::updateOnTimer()
...
@@ -586,19 +586,12 @@ void ControlsWidget::updateOnTimer()
enableVideo
(
THEMIM
->
getIM
()
->
hasVideo
()
);
enableVideo
(
THEMIM
->
getIM
()
->
hasVideo
()
);
}
}
/* FIXME */
void
ControlsWidget
::
setStatus
(
int
status
)
void
ControlsWidget
::
setStatus
(
int
status
)
{
{
if
(
status
==
1
)
// Playing
if
(
status
==
PLAYING_S
)
// Playing
{
playButton
->
setIcon
(
QIcon
(
":/pixmaps/pause.png"
)
);
msg_Dbg
(
p_intf
,
"I was here %i"
,
status
);
// playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
}
else
else
{
playButton
->
setIcon
(
QIcon
(
":/pixmaps/play.png"
)
);
msg_Dbg
(
p_intf
,
"I was here %i"
,
status
);
// playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
}
}
}
/**
/**
...
...
modules/gui/qt4/input_manager.cpp
View file @
fc63146c
...
@@ -88,16 +88,11 @@ void InputManager::update()
...
@@ -88,16 +88,11 @@ void InputManager::update()
emit
positionUpdated
(
0.0
,
0
,
0
);
emit
positionUpdated
(
0.0
,
0
,
0
);
emit
navigationChanged
(
0
);
emit
navigationChanged
(
0
);
i_old_playing_status
=
0
;
i_old_playing_status
=
0
;
emit
statusChanged
(
0
);
// 0 = STOPPED, 1 = PLAY, 2 = PAUSE
emit
statusChanged
(
END_S
);
// see vlc_input.h, input_state_e enum
delInput
();
delInput
();
return
;
return
;
}
}
if
(
!
b_had_audio
&&
b_has_audio
)
emit
audioStarted
();
if
(
!
b_had_video
&&
b_has_video
)
emit
videoStarted
();
/* Update position */
/* Update position */
mtime_t
i_length
,
i_time
;
mtime_t
i_length
,
i_time
;
float
f_pos
;
float
f_pos
;
...
...
modules/gui/qt4/input_manager.hpp
View file @
fc63146c
...
@@ -65,8 +65,6 @@ signals:
...
@@ -65,8 +65,6 @@ signals:
void
navigationChanged
(
int
);
void
navigationChanged
(
int
);
/// Play/pause status
/// Play/pause status
void
statusChanged
(
int
);
void
statusChanged
(
int
);
void
audioStarted
();
void
videoStarted
();
};
};
class
MainInputManager
:
public
QObject
class
MainInputManager
:
public
QObject
...
...
modules/gui/qt4/pixmaps/pause.png
0 → 100644
View file @
fc63146c
406 Bytes
modules/gui/qt4/res.qrc
View file @
fc63146c
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
<RCC
version=
"1.0"
>
<RCC
version=
"1.0"
>
<qresource>
<qresource>
<file>
pixmaps/play.png
</file>
<file>
pixmaps/play.png
</file>
<file>
pixmaps/pause.png
</file>
<file>
pixmaps/stop.png
</file>
<file>
pixmaps/stop.png
</file>
<file>
pixmaps/previous.png
</file>
<file>
pixmaps/previous.png
</file>
<file>
pixmaps/next.png
</file>
<file>
pixmaps/next.png
</file>
...
...
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