Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
456
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
df2362a8
Commit
df2362a8
authored
17 years ago
by
Pierre d'Herbemont
Browse files
Options
Downloads
Patches
Plain Diff
MacOSX/Framework: Fix my previous commit.
parent
8dcc9704
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
extras/MacOSX/Framework/Headers/Internal/VLCVideoCommon.h
+0
-37
0 additions, 37 deletions
extras/MacOSX/Framework/Headers/Internal/VLCVideoCommon.h
extras/MacOSX/Framework/Sources/VLCVideoCommon.m
+0
-63
0 additions, 63 deletions
extras/MacOSX/Framework/Sources/VLCVideoCommon.m
with
0 additions
and
100 deletions
extras/MacOSX/Framework/Headers/Internal/VLCVideoCommon.h
+
0
−
37
View file @
df2362a8
...
...
@@ -35,40 +35,3 @@
+
(
id
)
layoutManager
;
@end
/*****************************************************************************
* VLCVideoCommon.h: VLC.framework VLCVideoCommon header
*****************************************************************************
* Copyright (C) 2007 Pierre d'Herbemont
* Copyright (C) 2007 the VideoLAN team
* $Id: VLCVideoCommon.h 23915 2007-12-28 22:20:19Z pdherbemont $
*
* Authors: Pierre d'Herbemont <pdherbemont # 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import <QuartzCore/QuartzCore.h>
@interface
VLCVideoLayoutManager
:
NSObject
{
CGSize
originalVideoSize
;
BOOL
fillScreenEntirely
;
}
@property
BOOL
fillScreenEntirely
;
@property
CGSize
originalVideoSize
;
+
(
id
)
layoutManager
;
@end
This diff is collapsed.
Click to expand it.
extras/MacOSX/Framework/Sources/VLCVideoCommon.m
+
0
−
63
View file @
df2362a8
...
...
@@ -61,66 +61,3 @@
}
}
@end
/*****************************************************************************
* VLCVideoCommon.m: VLC.framework VLCVideoCommon implementation
*****************************************************************************
* Copyright (C) 2007 Pierre d'Herbemont
* Copyright (C) 2007 the VideoLAN team
* $Id: VLCVideoCommon.m 23915 2007-12-28 22:20:19Z pdherbemont $
*
* Authors: Pierre d'Herbemont <pdherbemont # 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#import "VLCVideoCommon.h"
/******************************************************************************
* Implementation VLCVideoLayoutManager
*
* Manage the size of the video layer
*/
@implementation
VLCVideoLayoutManager
@synthesize
fillScreenEntirely
;
@synthesize
originalVideoSize
;
+
(
id
)
layoutManager
{
return
[[[
self
alloc
]
init
]
autorelease
];
}
-
(
void
)
layoutSublayersOfLayer
:(
CALayer
*
)
layer
{
/* After having done everything normally resize the vlcopengllayer */
if
(
[[
layer
sublayers
]
count
]
>
0
&&
[[[[
layer
sublayers
]
objectAtIndex
:
0
]
name
]
isEqualToString
:
@"vlcopengllayer"
])
{
CALayer
*
videolayer
=
[[
layer
sublayers
]
objectAtIndex
:
0
];
CGRect
bounds
=
layer
.
bounds
;
CGRect
videoRect
=
bounds
;
CGFloat
xRatio
=
CGRectGetWidth
(
bounds
)
/
originalVideoSize
.
width
;
CGFloat
yRatio
=
CGRectGetHeight
(
bounds
)
/
originalVideoSize
.
height
;
CGFloat
ratio
=
fillScreenEntirely
?
MAX
(
xRatio
,
yRatio
)
:
MIN
(
xRatio
,
yRatio
);
videoRect
.
size
.
width
=
ratio
*
originalVideoSize
.
width
;
videoRect
.
size
.
height
=
ratio
*
originalVideoSize
.
height
;
videoRect
.
origin
.
x
+=
(
CGRectGetWidth
(
bounds
)
-
CGRectGetWidth
(
videoRect
))
/
2
.
0
;
videoRect
.
origin
.
y
+=
(
CGRectGetHeight
(
bounds
)
-
CGRectGetHeight
(
videoRect
))
/
2
.
0
;
videolayer
.
frame
=
videoRect
;
}
}
@end
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment