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
627feeb6
Commit
627feeb6
authored
Dec 24, 2010
by
Jakub Wieczorek
Committed by
Jean-Baptiste Kempf
Dec 26, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
InputManager: Rename the status property to playingStatus and add a getter.
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
75a0c9e1
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
8 deletions
+14
-8
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/controller.cpp
+1
-1
modules/gui/qt4/dialogs/extended.cpp
modules/gui/qt4/dialogs/extended.cpp
+1
-1
modules/gui/qt4/extensions_manager.cpp
modules/gui/qt4/extensions_manager.cpp
+1
-1
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+7
-2
modules/gui/qt4/input_manager.hpp
modules/gui/qt4/input_manager.hpp
+2
-1
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-1
modules/gui/qt4/main_interface_win32.cpp
modules/gui/qt4/main_interface_win32.cpp
+1
-1
No files found.
modules/gui/qt4/components/controller.cpp
View file @
627feeb6
...
...
@@ -67,7 +67,7 @@ AbstractController::AbstractController( intf_thread_t * _p_i, QWidget *_parent )
toolbarActionsMapper
=
new
QSignalMapper
(
this
);
CONNECT
(
toolbarActionsMapper
,
mapped
(
int
),
ActionsManager
::
getInstance
(
p_intf
),
doAction
(
int
)
);
CONNECT
(
THEMIM
->
getIM
(),
s
tatusChanged
(
int
),
this
,
setStatus
(
int
)
);
CONNECT
(
THEMIM
->
getIM
(),
playingS
tatusChanged
(
int
),
this
,
setStatus
(
int
)
);
setSizePolicy
(
QSizePolicy
::
MinimumExpanding
,
QSizePolicy
::
Fixed
);
}
...
...
modules/gui/qt4/dialogs/extended.cpp
View file @
627feeb6
...
...
@@ -111,7 +111,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
move
(
450
,
0
);
}
CONNECT
(
THEMIM
->
getIM
(),
s
tatusChanged
(
int
),
this
,
changedItem
(
int
)
);
CONNECT
(
THEMIM
->
getIM
(),
playingS
tatusChanged
(
int
),
this
,
changedItem
(
int
)
);
}
ExtendedDialog
::~
ExtendedDialog
()
...
...
modules/gui/qt4/extensions_manager.cpp
View file @
627feeb6
...
...
@@ -48,7 +48,7 @@ ExtensionsManager::ExtensionsManager( intf_thread_t *_p_intf, QObject *parent )
menuMapper
=
new
QSignalMapper
(
this
);
CONNECT
(
menuMapper
,
mapped
(
int
),
this
,
triggerMenu
(
int
)
);
CONNECT
(
THEMIM
->
getIM
(),
s
tatusChanged
(
int
),
this
,
playingChanged
(
int
)
);
CONNECT
(
THEMIM
->
getIM
(),
playingS
tatusChanged
(
int
),
this
,
playingChanged
(
int
)
);
DCONNECT
(
THEMIM
,
inputChanged
(
input_thread_t
*
),
this
,
inputChanged
(
input_thread_t
*
)
);
b_unloading
=
false
;
...
...
modules/gui/qt4/input_manager.cpp
View file @
627feeb6
...
...
@@ -157,7 +157,7 @@ void InputManager::delInput()
emit
nameChanged
(
""
);
emit
chapterChanged
(
0
);
emit
titleChanged
(
0
);
emit
s
tatusChanged
(
END_S
);
emit
playingS
tatusChanged
(
END_S
);
emit
teletextPossible
(
false
);
emit
AtoBchanged
(
false
,
false
);
...
...
@@ -436,7 +436,7 @@ void InputManager::UpdateStatus()
if
(
i_old_playing_status
!=
state
)
{
i_old_playing_status
=
state
;
emit
s
tatusChanged
(
state
);
emit
playingS
tatusChanged
(
state
);
}
}
...
...
@@ -498,6 +498,11 @@ void InputManager::UpdateName()
}
}
int
InputManager
::
playingStatus
()
{
return
i_old_playing_status
;
}
bool
InputManager
::
hasAudio
()
{
if
(
hasInput
()
)
...
...
modules/gui/qt4/input_manager.hpp
View file @
627feeb6
...
...
@@ -130,6 +130,7 @@ public:
&&
vlc_object_alive
(
p_input
);
/* and the VLC object is alive */
}
int
playingStatus
();
bool
hasAudio
();
bool
hasVideo
()
{
return
hasInput
()
&&
b_video
;
}
void
requestArtUpdate
();
...
...
@@ -218,7 +219,7 @@ signals:
void
metaChanged
(
input_item_t
*
);
void
artChanged
(
QString
);
/// Play/pause status
void
s
tatusChanged
(
int
);
void
playingS
tatusChanged
(
int
);
void
recordingStateChanged
(
bool
);
/// Teletext
void
teletextPossible
(
bool
);
...
...
modules/gui/qt4/main_interface.cpp
View file @
627feeb6
...
...
@@ -193,7 +193,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
#ifndef HAVE_MAEMO
if
(
sysTray
)
{
CONNECT
(
THEMIM
->
getIM
(),
s
tatusChanged
(
int
),
CONNECT
(
THEMIM
->
getIM
(),
playingS
tatusChanged
(
int
),
this
,
updateSystrayTooltipStatus
(
int
)
);
}
#endif
...
...
modules/gui/qt4/main_interface_win32.cpp
View file @
627feeb6
...
...
@@ -142,7 +142,7 @@ void MainInterface::createTaskBarButtons()
if
(
S_OK
!=
hr
)
msg_Err
(
p_intf
,
"ThumbBarAddButtons failed with error %08x"
,
hr
);
}
CONNECT
(
THEMIM
->
getIM
(),
s
tatusChanged
(
int
),
this
,
changeThumbbarButtons
(
int
)
);
CONNECT
(
THEMIM
->
getIM
(),
playingS
tatusChanged
(
int
),
this
,
changeThumbbarButtons
(
int
)
);
}
else
{
...
...
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