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
44521604
Commit
44521604
authored
Oct 15, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - Various comments and unimportant fixes.
parent
715335bb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
9 deletions
+25
-9
modules/gui/qt4/input_manager.cpp
modules/gui/qt4/input_manager.cpp
+7
-2
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+15
-5
modules/gui/qt4/qt4.hpp
modules/gui/qt4/qt4.hpp
+3
-2
No files found.
modules/gui/qt4/input_manager.cpp
View file @
44521604
...
...
@@ -82,7 +82,11 @@ void InputManager::delInput()
void
InputManager
::
update
()
{
/// \todo Emit the signals only if it changed
if
(
!
p_input
)
return
;
if
(
!
p_input
)
{
emit
nameChanged
(
""
);
return
;
}
if
(
p_input
->
b_dead
||
p_input
->
b_die
)
{
...
...
@@ -101,7 +105,7 @@ void InputManager::update()
i_time
=
var_GetTime
(
p_input
,
"time"
)
/
1000000
;
f_pos
=
var_GetFloat
(
p_input
,
"position"
);
emit
positionUpdated
(
f_pos
,
i_time
,
i_length
);
int
i_new_rate
=
var_GetInteger
(
p_input
,
"rate"
);
if
(
i_new_rate
!=
i_rate
)
{
...
...
@@ -162,6 +166,7 @@ void InputManager::update()
emit
nameChanged
(
text
);
old_name
=
text
;
}
/* Update playing status */
var_Get
(
p_input
,
"state"
,
&
val
);
val
.
i_int
=
val
.
i_int
==
PAUSE_S
?
PAUSE_S
:
PLAYING_S
;
...
...
modules/gui/qt4/qt4.cpp
View file @
44521604
...
...
@@ -218,28 +218,32 @@ static void Init( intf_thread_t *p_intf )
int
argc
=
1
;
Q_INIT_RESOURCE
(
vlc
);
#ifndef WIN32
/* KLUDGE:
* disables icon theme use because that makes cleanlook style bug
* disables icon theme use because that makes Cleanlooks style bug
* because it asks gconf for some settings that timeout because of threads
* see commits 21610 21622 21654 for reference */
QApplication
::
setDesktopSettingsAware
(
false
);
#endif
/* Start the QApplication here */
QApplication
*
app
=
new
QApplication
(
argc
,
argv
,
true
);
app
->
setWindowIcon
(
QIcon
(
QPixmap
(
vlc_xpm
)
)
);
p_intf
->
p_sys
->
p_app
=
app
;
// Initialize timers
// Initialize timers
and the Dialog Provider
DialogsProvider
::
getInstance
(
p_intf
);
//
N
ormal interface
//
Create the n
ormal interface
if
(
!
p_intf
->
pf_show_dialog
)
{
MainInterface
*
p_mi
=
new
MainInterface
(
p_intf
);
p_intf
->
p_sys
->
p_mi
=
p_mi
;
p_mi
->
show
();
}
if
(
p_intf
->
pf_show_dialog
)
else
/*if( p_intf->pf_show_dialog )*/
vlc_thread_ready
(
p_intf
);
/* Start playing if needed */
...
...
@@ -248,10 +252,16 @@ static void Init( intf_thread_t *p_intf )
playlist_Control
(
THEPL
,
PLAYLIST_AUTOPLAY
,
VLC_FALSE
);
}
/* Explain to the core how to show a dialog :D */
p_intf
->
pf_show_dialog
=
ShowDialog
;
/* Last settings */
app
->
setQuitOnLastWindowClosed
(
false
);
/* Launch */
app
->
exec
();
/* And quit */
MainInputManager
::
killInstance
();
DialogsProvider
::
killInstance
();
delete
p_intf
->
p_sys
->
p_mi
;
...
...
modules/gui/qt4/qt4.hpp
View file @
44521604
...
...
@@ -5,6 +5,7 @@
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
...
...
@@ -93,8 +94,8 @@ struct intf_sys_t
else x->show(); }
static
int
DialogEvent_Type
=
QEvent
::
User
+
1
;
static
int
PLUndockEvent_Type
=
QEvent
::
User
+
2
;
static
int
PLDockEvent_Type
=
QEvent
::
User
+
3
;
//
static int PLUndockEvent_Type = QEvent::User + 2;
//
static int PLDockEvent_Type = QEvent::User + 3;
static
int
SetVideoOnTopEvent_Type
=
QEvent
::
User
+
4
;
class
DialogEvent
:
public
QEvent
...
...
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