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
6341cc88
Commit
6341cc88
authored
Sep 06, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed initial snpshot/fullscreen state.
It fixes a regression introduced by
fccf6aa0
parent
fccf6aa0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
15 deletions
+7
-15
modules/gui/qt4/components/interface_widgets.cpp
modules/gui/qt4/components/interface_widgets.cpp
+1
-0
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+4
-14
modules/gui/qt4/input_manager.hpp
modules/gui/qt4/input_manager.hpp
+2
-1
No files found.
modules/gui/qt4/components/interface_widgets.cpp
View file @
6341cc88
...
...
@@ -914,6 +914,7 @@ void ControlsWidget::updateInput()
{
/* Activate the interface buttons according to the presence of the input */
enableInput
(
THEMIM
->
getIM
()
->
hasInput
()
);
enableVideo
(
THEMIM
->
getIM
()
->
hasVideo
()
);
}
void
ControlsWidget
::
setStatus
(
int
status
)
...
...
modules/gui/qt4/input_manager.cpp
View file @
6341cc88
...
...
@@ -69,6 +69,7 @@ InputManager::InputManager( QObject *parent, intf_thread_t *_p_intf) :
p_input
=
NULL
;
i_rate
=
0
;
i_input_id
=
0
;
b_video
=
false
;
b_transparentTelextext
=
false
;
}
...
...
@@ -117,6 +118,7 @@ void InputManager::delInput()
i_input_id
=
0
;
old_name
=
""
;
artUrl
=
""
;
b_video
=
false
;
emit
positionUpdated
(
-
1.0
,
0
,
0
);
emit
statusChanged
(
END_S
);
emit
nameChanged
(
""
);
...
...
@@ -350,18 +352,6 @@ bool InputManager::hasAudio()
return
false
;
}
bool
InputManager
::
hasVideo
()
{
if
(
hasInput
()
)
{
vlc_value_t
val
;
var_Change
(
p_input
,
"video-es"
,
VLC_VAR_CHOICESCOUNT
,
&
val
,
NULL
);
return
val
.
i_int
>
0
;
}
return
false
;
}
void
InputManager
::
UpdateSPU
()
{
UpdateTeletext
();
...
...
@@ -380,10 +370,10 @@ void InputManager::UpdateVout()
if
(
hasInput
()
)
{
vlc_object_t
*
p_vout
=
(
vlc_object_t
*
)
vlc_object_find
(
p_input
,
VLC_OBJECT_VOUT
,
FIND_CHILD
);
b
ool
b_vout
=
p_vout
!=
NULL
;
b
_video
=
p_vout
!=
NULL
;
if
(
p_vout
)
vlc_object_release
(
p_vout
);
emit
voutChanged
(
b_v
out
);
emit
voutChanged
(
b_v
ideo
);
}
}
...
...
modules/gui/qt4/input_manager.hpp
View file @
6341cc88
...
...
@@ -71,7 +71,7 @@ public:
void
delInput
();
bool
hasInput
()
{
return
p_input
&&
!
p_input
->
b_dead
&&
vlc_object_alive
(
p_input
);
}
bool
hasAudio
();
bool
hasVideo
()
;
bool
hasVideo
()
{
return
hasInput
()
&&
b_video
;
}
QString
getName
()
{
return
old_name
;
}
...
...
@@ -84,6 +84,7 @@ private:
QString
artUrl
;
int
i_rate
;
bool
b_transparentTelextext
;
bool
b_video
;
void
customEvent
(
QEvent
*
);
void
addCallbacks
();
...
...
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