Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
b38e99dd
Commit
b38e99dd
authored
Aug 22, 2008
by
Loïc Minier
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of git.videolan.org:vlc
parents
e40db6d8
2d5437ce
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
6 deletions
+16
-6
modules/gui/macosx/open.m
modules/gui/macosx/open.m
+1
-1
modules/gui/qt4/components/extended_panels.cpp
modules/gui/qt4/components/extended_panels.cpp
+1
-1
modules/gui/qt4/components/playlist/playlist_model.cpp
modules/gui/qt4/components/playlist/playlist_model.cpp
+13
-3
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-1
No files found.
modules/gui/macosx/open.m
View file @
b38e99dd
...
...
@@ -924,7 +924,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
-
(
IBAction
)
eyetvGetPlugin
:(
id
)
sender
{
[[
NSWorkspace
sharedWorkspace
]
openURL
:
[
NSURL
URLWithString
:
@"http://www.videolan.org/eyetv"
]];
[[
NSWorkspace
sharedWorkspace
]
openURL
:
[
NSURL
URLWithString
:
@"http://www.videolan.org/
vlc/
eyetv"
]];
}
-
(
void
)
eyetvChanged
:(
NSNotification
*
)
o_notification
...
...
modules/gui/qt4/components/extended_panels.cpp
View file @
b38e99dd
...
...
@@ -222,7 +222,7 @@ ExtVideo::~ExtVideo()
void
ExtVideo
::
cropChange
()
{
p_vout
=
(
vout_thread_t
*
)
vlc_object_find
(
p_intf
,
VLC_OBJECT_VOUT
,
FIND_
CHILD
);
VLC_OBJECT_VOUT
,
FIND_
ANYWHERE
);
if
(
p_vout
)
{
var_SetInteger
(
p_vout
,
"crop-top"
,
ui
.
cropTopPx
->
value
()
);
...
...
modules/gui/qt4/components/playlist/playlist_model.cpp
View file @
b38e99dd
...
...
@@ -946,9 +946,19 @@ void PLModel::popupExplore()
char
*
psz_meta
=
input_item_GetURI
(
p_input
);
if
(
psz_meta
)
{
/* FIXME add a MRLSplit like function */
QFileInfo
info
(
qfu
(
psz_meta
)
);
QDesktopServices
::
openUrl
(
QUrl
::
fromLocalFile
(
info
.
absolutePath
()
)
);
const
char
*
psz_access
;
const
char
*
psz_demux
;
char
*
psz_path
;
input_SplitMRL
(
&
psz_access
,
&
psz_demux
,
&
psz_path
,
psz_meta
);
if
(
EMPTY_STR
(
psz_access
)
||
!
strncasecmp
(
psz_access
,
"file"
,
4
)
||
!
strncasecmp
(
psz_access
,
"dire"
,
4
)
)
{
QFileInfo
info
(
qfu
(
psz_meta
)
);
QDesktopServices
::
openUrl
(
QUrl
::
fromLocalFile
(
info
.
absolutePath
()
)
);
}
free
(
psz_meta
);
}
}
...
...
modules/gui/qt4/main_interface.cpp
View file @
b38e99dd
...
...
@@ -713,8 +713,8 @@ void MainInterface::releaseVideoSlot( void *p_win )
bgWidget
->
show
();
}
adjustSize
();
videoIsActive
=
false
;
if
(
!
isFullScreen
()
)
adjustSize
();
}
int
MainInterface
::
controlVideo
(
void
*
p_window
,
int
i_query
,
va_list
args
)
...
...
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