Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
69c492db
Commit
69c492db
authored
Aug 31, 2006
by
zorglub
Browse files
* Move the embedded option to libvlc
* Make the interface a bit smaller
parent
197dcf82
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/gui/qt4/main_interface.cpp
View file @
69c492db
...
...
@@ -34,10 +34,10 @@
#include "menus.hpp"
#ifdef WIN32
#define PREF_W 4
3
0
#define PREF_W 4
1
0
#define PREF_H 121
#else
#define PREF_W 4
8
0
#define PREF_W 4
5
0
#define PREF_H 125
#endif
...
...
@@ -80,10 +80,10 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
statusBar
()
->
addPermanentWidget
(
timeLabel
,
1
);
resize
(
PREF_W
,
PREF_H
);
// if( config_GetInt( p_intf, "embedded" ) )
if
(
config_GetInt
(
p_intf
,
"embedded"
)
)
{
videoWidget
=
new
VideoWidget
(
p_intf
,
config_GetInt
(
p_intf
,
"qt-always-video"
)
?
true
:
false
);
videoWidget
=
new
VideoWidget
(
p_intf
,
config_GetInt
(
p_intf
,
"qt-always-video"
)
?
true
:
false
);
if
(
config_GetInt
(
p_intf
,
"qt-always-video"
)
)
{
QSettings
settings
(
"VideoLAN"
,
"VLC"
);
...
...
@@ -99,15 +99,10 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
readSettings
(
"MainWindow"
);
addSize
=
QSize
(
ui
.
vboxLayout
->
margin
()
*
2
,
PREF_H
);
// if( config_GetInt( p_intf, "qt-always-video" ) )
mainSize
.
setWidth
(
videoSize
.
width
()
+
addSize
.
width
()
);
mainSize
.
setHeight
(
videoSize
.
height
()
+
addSize
.
height
()
);
// else
// mainSize = QSize( PREF_W, PREF_H );
fprintf
(
stderr
,
"Resulting size %ix%i"
,
mainSize
.
width
(),
mainSize
.
height
()
);
mainSize
.
setWidth
(
videoSize
.
width
()
+
addSize
.
width
()
);
mainSize
.
setHeight
(
videoSize
.
height
()
+
addSize
.
height
()
);
resize
(
mainSize
);
mainSize
=
size
();
fprintf
(
stderr
,
"After size %ix%i"
,
mainSize
.
width
(),
mainSize
.
height
()
);
setMinimumSize
(
PREF_W
,
addSize
.
height
()
);
...
...
src/libvlc.h
View file @
69c492db
...
...
@@ -275,6 +275,10 @@ static char *ppsz_align_descriptions[] =
"Output video in grayscale. As the color information aren't decoded, " \
"this can save some processing power." )
#define EMBEDDED_TEXT N_("Embedded video")
#define EMBEDDED_LONGTEXT N_( \
"Embed the video output in the main interface." )
#define FULLSCREEN_TEXT N_("Fullscreen video output")
#define FULLSCREEN_LONGTEXT N_( \
"Start video in fullscreen mode" )
...
...
@@ -1249,6 +1253,8 @@ vlc_module_begin();
add_bool
(
"fullscreen"
,
0
,
NULL
,
FULLSCREEN_TEXT
,
FULLSCREEN_LONGTEXT
,
VLC_FALSE
);
change_short
(
'f'
);
add_bool
(
"embedded-video"
,
1
,
NULL
,
EMBEDDED_TEXT
,
EMBEDDED_LONGTEXT
,
VLC_TRUE
);
add_bool
(
"drop-late-frames"
,
1
,
NULL
,
DROP_LATE_FRAMES_TEXT
,
DROP_LATE_FRAMES_LONGTEXT
,
VLC_TRUE
);
/* Used in vout_synchro */
...
...
Write
Preview
Supports
Markdown
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