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
5e0c0bbd
Commit
5e0c0bbd
authored
Sep 01, 2007
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* set svn:keywords correctly and fixed some minor stuff here and there
parent
c08be60a
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
16 additions
and
19 deletions
+16
-19
modules/gui/minimal_macosx/VLCMinimalVoutWindow.h
modules/gui/minimal_macosx/VLCMinimalVoutWindow.h
+1
-1
modules/gui/minimal_macosx/VLCMinimalVoutWindow.m
modules/gui/minimal_macosx/VLCMinimalVoutWindow.m
+1
-1
modules/gui/minimal_macosx/VLCOpenGLVoutView.h
modules/gui/minimal_macosx/VLCOpenGLVoutView.h
+1
-1
modules/gui/minimal_macosx/VLCOpenGLVoutView.m
modules/gui/minimal_macosx/VLCOpenGLVoutView.m
+2
-2
modules/gui/minimal_macosx/intf.h
modules/gui/minimal_macosx/intf.h
+1
-4
modules/gui/minimal_macosx/macosx.c
modules/gui/minimal_macosx/macosx.c
+4
-4
modules/gui/minimal_macosx/voutagl.m
modules/gui/minimal_macosx/voutagl.m
+3
-3
modules/gui/minimal_macosx/voutgl.h
modules/gui/minimal_macosx/voutgl.h
+1
-1
modules/gui/minimal_macosx/voutgl.m
modules/gui/minimal_macosx/voutgl.m
+2
-2
No files found.
modules/gui/minimal_macosx/VLCMinimalVoutWindow.h
View file @
5e0c0bbd
/*****************************************************************************
/*****************************************************************************
* VLCMinimalVoutWindow.h: MacOS X Minimal window for a vout
* VLCMinimalVoutWindow.h: MacOS X Minimal window for a vout
*****************************************************************************
*****************************************************************************
* Copyright (C) 200
1-2004
the VideoLAN team
* Copyright (C) 200
7
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
* Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
...
...
modules/gui/minimal_macosx/VLCMinimalVoutWindow.m
View file @
5e0c0bbd
/*****************************************************************************
/*****************************************************************************
* VLCMinimalVoutWindow.m: MacOS X Minimal interface window
* VLCMinimalVoutWindow.m: MacOS X Minimal interface window
*****************************************************************************
*****************************************************************************
* Copyright (C) 200
1-2004
the VideoLAN team
* Copyright (C) 200
7
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
* Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
...
...
modules/gui/minimal_macosx/VLCOpenGLVoutView.h
View file @
5e0c0bbd
/*****************************************************************************
/*****************************************************************************
* VLCOpenGLVoutView.h: MacOS X OpenGL provider
* VLCOpenGLVoutView.h: MacOS X OpenGL provider
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001-200
4
the VideoLAN team
* Copyright (C) 2001-200
7
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Colin Delacroix <colin@zoy.org>
* Authors: Colin Delacroix <colin@zoy.org>
...
...
modules/gui/minimal_macosx/VLCOpenGLVoutView.m
View file @
5e0c0bbd
/*****************************************************************************
/*****************************************************************************
* VLCOpenGLVoutView.m: MacOS X OpenGL provider
* VLCOpenGLVoutView.m: MacOS X OpenGL provider
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001-200
4
the VideoLAN team
* Copyright (C) 2001-200
7
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Colin Delacroix <colin@zoy.org>
* Authors: Colin Delacroix <colin@zoy.org>
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
* Eric Petit <titer@m0k.org>
* Eric Petit <titer@m0k.org>
* Benjamin Pracht <bigben at videolan dot org>
* Benjamin Pracht <bigben at videolan dot org>
* Damien Fouilleul <damienf at videolan dot org>
* Damien Fouilleul <damienf at videolan dot org>
* Pierr d'Herbemont <pdherbemont at videolan dot org>
* Pierr
e
d'Herbemont <pdherbemont at videolan dot org>
*
*
* This program is free software; you can redistribute it and/or modify
* 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
* it under the terms of the GNU General Public License as published by
...
...
modules/gui/minimal_macosx/intf.h
View file @
5e0c0bbd
/*****************************************************************************
/*****************************************************************************
* intf.h: MacOS X interface module
* intf.h: MacOS X interface module
*****************************************************************************
*****************************************************************************
* Copyright (C) 2002-200
6
the VideoLAN team
* Copyright (C) 2002-200
7
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
...
@@ -36,9 +36,6 @@
...
@@ -36,9 +36,6 @@
/*****************************************************************************
/*****************************************************************************
* Local prototypes.
* Local prototypes.
*****************************************************************************/
*****************************************************************************/
/* switch this to 1, if you want to use Obj-C with GC */
#define GC_ENABLED 0
/*****************************************************************************
/*****************************************************************************
* intf_sys_t: description and status of the interface
* intf_sys_t: description and status of the interface
...
...
modules/gui/minimal_macosx/macosx.c
View file @
5e0c0bbd
/*****************************************************************************
/*****************************************************************************
* macosx.m: Mac OS X module for vlc
* macosx.m:
minimal
Mac OS X module for vlc
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001-200
6
the VideoLAN team
* Copyright (C) 2001-200
7
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Colin Delacroix <colin@zoy.org>
* Authors: Colin Delacroix <colin@zoy.org>
...
@@ -48,7 +48,7 @@ void E_(CloseVideoGL) ( vlc_object_t * );
...
@@ -48,7 +48,7 @@ void E_(CloseVideoGL) ( vlc_object_t * );
vlc_module_begin
();
vlc_module_begin
();
/* Minimal interface. see intf.m */
/* Minimal interface. see intf.m */
set_shortname
(
_
(
"minimal_macosx"
));
set_shortname
(
_
(
"minimal_macosx"
));
set_description
(
_
(
"M
ac OS X minimal
interface"
)
);
set_description
(
_
(
"M
inimal Mac OS X
interface"
)
);
set_capability
(
"interface"
,
50
);
set_capability
(
"interface"
,
50
);
set_callbacks
(
E_
(
OpenIntf
),
E_
(
CloseIntf
)
);
set_callbacks
(
E_
(
OpenIntf
),
E_
(
CloseIntf
)
);
set_category
(
CAT_INTERFACE
);
set_category
(
CAT_INTERFACE
);
...
@@ -56,7 +56,7 @@ vlc_module_begin();
...
@@ -56,7 +56,7 @@ vlc_module_begin();
add_submodule
();
add_submodule
();
/* Will be loaded even without interface module. see voutgl.m */
/* Will be loaded even without interface module. see voutgl.m */
set_description
(
"Mac OS X minimal OpenGL video output (opens a borderless window)"
);
set_description
(
_
(
"Minimal Mac OS X OpenGL video output (opens a borderless window)"
)
);
set_capability
(
"opengl provider"
,
50
);
set_capability
(
"opengl provider"
,
50
);
set_category
(
CAT_VIDEO
);
set_category
(
CAT_VIDEO
);
set_subcategory
(
SUBCAT_VIDEO_VOUT
);
set_subcategory
(
SUBCAT_VIDEO_VOUT
);
...
...
modules/gui/minimal_macosx/voutagl.m
View file @
5e0c0bbd
/*****************************************************************************
/*****************************************************************************
*
voutagl
.
c
:
MacOS
X
agl
OpenGL
provider
(
used
by
webbrowser
.
plugin
)
*
voutagl
.
c
:
MacOS
X
agl
OpenGL
provider
(
used
by
webbrowser
.
plugin
)
*****************************************************************************
*****************************************************************************
*
Copyright
(
C
)
2001
-
200
4
the
VideoLAN
team
*
Copyright
(
C
)
2001
-
200
7
the
VideoLAN
team
*
$Id$
*
$Id$
*
*
*
Authors
:
Colin
Delacroix
<
colin
@
zoy
.
org
>
*
Authors
:
Colin
Delacroix
<
colin
@
zoy
.
org
>
...
@@ -66,7 +66,7 @@ int aglInit( vout_thread_t * p_vout )
...
@@ -66,7 +66,7 @@ int aglInit( vout_thread_t * p_vout )
pixFormat
=
aglChoosePixelFormat
(
NULL
,
0
,
ATTRIBUTES
)
;
pixFormat
=
aglChoosePixelFormat
(
NULL
,
0
,
ATTRIBUTES
)
;
if
(
NULL
==
pixFormat
)
if
(
NULL
==
pixFormat
)
{
{
msg
_
Err
(
p
_
vout
,
"
n
o screen renderer available for required attributes."
)
;
msg
_
Err
(
p
_
vout
,
"
N
o screen renderer available for required attributes."
)
;
return
VLC
_
EGENERIC
;
return
VLC
_
EGENERIC
;
}
}
...
@@ -74,7 +74,7 @@ int aglInit( vout_thread_t * p_vout )
...
@@ -74,7 +74,7 @@ int aglInit( vout_thread_t * p_vout )
aglDestroyPixelFormat
(
pixFormat
)
;
aglDestroyPixelFormat
(
pixFormat
)
;
if
(
NULL
==
p
_
vout
->
p
_
sys
->
agl
_
ctx
)
if
(
NULL
==
p
_
vout
->
p
_
sys
->
agl
_
ctx
)
{
{
msg
_
Err
(
p
_
vout
,
"
c
annot create AGL context."
)
;
msg
_
Err
(
p
_
vout
,
"
C
annot create AGL context."
)
;
return
VLC
_
EGENERIC
;
return
VLC
_
EGENERIC
;
}
}
else
{
else
{
...
...
modules/gui/minimal_macosx/voutgl.h
View file @
5e0c0bbd
/*****************************************************************************
/*****************************************************************************
* voutgl.h: MacOS X OpenGL provider
* voutgl.h: MacOS X OpenGL provider
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001-200
6
the VideoLAN team
* Copyright (C) 2001-200
7
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Colin Delacroix <colin@zoy.org>
* Authors: Colin Delacroix <colin@zoy.org>
...
...
modules/gui/minimal_macosx/voutgl.m
View file @
5e0c0bbd
/*****************************************************************************
/*****************************************************************************
* voutgl.m: MacOS X OpenGL provider
* voutgl.m: MacOS X OpenGL provider
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001-200
4
the VideoLAN team
* Copyright (C) 2001-200
7
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Colin Delacroix
<colin
@
zoy
.
org
>
* Authors: Colin Delacroix
<colin
@
zoy
.
org
>
...
@@ -40,7 +40,7 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this )
...
@@ -40,7 +40,7 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this )
if( !CGDisplayUsesOpenGLAcceleration( kCGDirectMainDisplay ) )
if( !CGDisplayUsesOpenGLAcceleration( kCGDirectMainDisplay ) )
{
{
msg_Warn( p_vout, "
n
o OpenGL hardware acceleration found. "
msg_Warn( p_vout, "
N
o OpenGL hardware acceleration found. "
"Video display will be slow" );
"Video display will be slow" );
return( 1 );
return( 1 );
}
}
...
...
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