From f88c57c4e71bef2e168e4901069a651d9863fd38 Mon Sep 17 00:00:00 2001 From: Faustino Osuna Date: Mon, 31 Mar 2008 23:28:26 +0100 Subject: [PATCH] VLCKit.framework: Documentation updates and whitespace cleanup. --- .../framework/Headers/Public/VLCLibrary.h | 2 +- .../Headers/Public/VLCStreamOutput.h | 30 +++++++++++++----- .../Headers/Public/VLCStreamSession.h | 30 +++++++++++++----- projects/macosx/framework/Sources/VLCAudio.m | 2 +- .../framework/Sources/VLCEventManager.m | 3 +- .../macosx/framework/Sources/VLCLibrary.m | 2 +- projects/macosx/framework/Sources/VLCMedia.m | 2 +- .../framework/Sources/VLCMediaDiscoverer.m | 2 +- .../framework/Sources/VLCMediaLibrary.m | 2 +- .../macosx/framework/Sources/VLCMediaList.m | 2 +- .../framework/Sources/VLCMediaListAspect.m | 2 +- .../macosx/framework/Sources/VLCMediaPlayer.m | 2 +- .../framework/Sources/VLCStreamOutput.m | 31 ++++++++++++++----- .../framework/Sources/VLCStreamSession.m | 30 +++++++++++++----- projects/macosx/framework/Sources/VLCTime.m | 2 +- .../macosx/framework/Sources/VLCVideoCommon.m | 10 ++++-- .../macosx/framework/Sources/VLCVideoLayer.m | 2 +- 17 files changed, 111 insertions(+), 45 deletions(-) diff --git a/projects/macosx/framework/Headers/Public/VLCLibrary.h b/projects/macosx/framework/Headers/Public/VLCLibrary.h index 89009c2d88..b43d74cb1c 100644 --- a/projects/macosx/framework/Headers/Public/VLCLibrary.h +++ b/projects/macosx/framework/Headers/Public/VLCLibrary.h @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCLibrary.h: VLCKit.framework VLCLibrary implementation + * VLCLibrary.h: VLCKit.framework VLCLibrary header ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team diff --git a/projects/macosx/framework/Headers/Public/VLCStreamOutput.h b/projects/macosx/framework/Headers/Public/VLCStreamOutput.h index 5d9f7fe302..63f467f03d 100644 --- a/projects/macosx/framework/Headers/Public/VLCStreamOutput.h +++ b/projects/macosx/framework/Headers/Public/VLCStreamOutput.h @@ -1,10 +1,26 @@ -// -// VLCStreamOutput.h -// VLCKit -// -// Created by Pierre d'Herbemont on 1/12/08. -// Copyright 2008 __MyCompanyName__. All rights reserved. -// +/***************************************************************************** + * VLCStreamOutput.h: VLCKit.framework VLCStreamOutput header + ***************************************************************************** + * Copyright (C) 2008 Pierre d'Herbemont + * Copyright (C) 2008 the VideoLAN team + * $Id$ + * + * Authors: Pierre d'Herbemont + * + * 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 diff --git a/projects/macosx/framework/Headers/Public/VLCStreamSession.h b/projects/macosx/framework/Headers/Public/VLCStreamSession.h index 3e087a4880..2772e58580 100644 --- a/projects/macosx/framework/Headers/Public/VLCStreamSession.h +++ b/projects/macosx/framework/Headers/Public/VLCStreamSession.h @@ -1,10 +1,26 @@ -// -// VLCStreamSession.h -// VLCKit -// -// Created by Pierre d'Herbemont on 1/12/08. -// Copyright 2008 __MyCompanyName__. All rights reserved. -// +/***************************************************************************** + * VLCStreamSession.h: VLCKit.framework VLCStreamSession header + ***************************************************************************** + * Copyright (C) 2008 Pierre d'Herbemont + * Copyright (C) 2008 the VideoLAN team + * $Id$ + * + * Authors: Pierre d'Herbemont + * + * 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 #import diff --git a/projects/macosx/framework/Sources/VLCAudio.m b/projects/macosx/framework/Sources/VLCAudio.m index e81a03bfe6..f511a7ff7b 100644 --- a/projects/macosx/framework/Sources/VLCAudio.m +++ b/projects/macosx/framework/Sources/VLCAudio.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCAudio.m: VLC.framework VLCAudio implementation + * VLCAudio.m: VLCKit.framework VLCAudio implementation ***************************************************************************** * Copyright (C) 2007 Faustino E. Osuna * Copyright (C) 2007 the VideoLAN team diff --git a/projects/macosx/framework/Sources/VLCEventManager.m b/projects/macosx/framework/Sources/VLCEventManager.m index 87d881ba65..6158fee462 100644 --- a/projects/macosx/framework/Sources/VLCEventManager.m +++ b/projects/macosx/framework/Sources/VLCEventManager.m @@ -1,6 +1,5 @@ /***************************************************************************** - * VLCEventManager.h: VLC.framework VLCEventManager implementation - * This is used to communicate in a sound way accross threads. + * VLCEventManager.m: VLCKit.framework VLCEventManager implementation ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team diff --git a/projects/macosx/framework/Sources/VLCLibrary.m b/projects/macosx/framework/Sources/VLCLibrary.m index 2550a4896b..9252ce6aed 100644 --- a/projects/macosx/framework/Sources/VLCLibrary.m +++ b/projects/macosx/framework/Sources/VLCLibrary.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCLibrary.h: VLC.framework VLCLibrary implementation + * VLCLibrary.m: VLCKit.framework VLCLibrary implementation ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team diff --git a/projects/macosx/framework/Sources/VLCMedia.m b/projects/macosx/framework/Sources/VLCMedia.m index 02e05fe7b6..37561783b1 100644 --- a/projects/macosx/framework/Sources/VLCMedia.m +++ b/projects/macosx/framework/Sources/VLCMedia.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCMedia.m: VLC.framework VLCMedia implementation + * VLCMedia.m: VLCKit.framework VLCMedia implementation ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team diff --git a/projects/macosx/framework/Sources/VLCMediaDiscoverer.m b/projects/macosx/framework/Sources/VLCMediaDiscoverer.m index 9957437619..274a0a14e1 100644 --- a/projects/macosx/framework/Sources/VLCMediaDiscoverer.m +++ b/projects/macosx/framework/Sources/VLCMediaDiscoverer.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCMediaDiscoverer.m: VLC.framework VLCMediaDiscoverer implementation + * VLCMediaDiscoverer.m: VLCKit.framework VLCMediaDiscoverer implementation ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team diff --git a/projects/macosx/framework/Sources/VLCMediaLibrary.m b/projects/macosx/framework/Sources/VLCMediaLibrary.m index d850ee0f08..401f80eeff 100644 --- a/projects/macosx/framework/Sources/VLCMediaLibrary.m +++ b/projects/macosx/framework/Sources/VLCMediaLibrary.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCMediaDiscoverer.m: VLC.framework VLCMediaDiscoverer implementation + * VLCMediaLibrary.m: VLCKit.framework VLCMediaLibrary implementation ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team diff --git a/projects/macosx/framework/Sources/VLCMediaList.m b/projects/macosx/framework/Sources/VLCMediaList.m index 8d1cc96a23..65522536d8 100644 --- a/projects/macosx/framework/Sources/VLCMediaList.m +++ b/projects/macosx/framework/Sources/VLCMediaList.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCMediaList.m: VLC.framework VLCMediaList implementation + * VLCMediaList.m: VLCKit.framework VLCMediaList implementation ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team diff --git a/projects/macosx/framework/Sources/VLCMediaListAspect.m b/projects/macosx/framework/Sources/VLCMediaListAspect.m index dc181f70a3..7b901cac99 100644 --- a/projects/macosx/framework/Sources/VLCMediaListAspect.m +++ b/projects/macosx/framework/Sources/VLCMediaListAspect.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCMediaList.m: VLC.framework VLCMediaList implementation + * VLCMediaListAspect.m: VLCKit.framework VLCMediaListAspect implementation ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team diff --git a/projects/macosx/framework/Sources/VLCMediaPlayer.m b/projects/macosx/framework/Sources/VLCMediaPlayer.m index e08e3fa04e..c1aa3e2c03 100644 --- a/projects/macosx/framework/Sources/VLCMediaPlayer.m +++ b/projects/macosx/framework/Sources/VLCMediaPlayer.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCMediaPlayer.m: VLC.framework VLCMediaPlayer implementation + * VLCMediaPlayer.m: VLCKit.framework VLCMediaPlayer implementation ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team diff --git a/projects/macosx/framework/Sources/VLCStreamOutput.m b/projects/macosx/framework/Sources/VLCStreamOutput.m index 0e98086749..d99c1c2187 100644 --- a/projects/macosx/framework/Sources/VLCStreamOutput.m +++ b/projects/macosx/framework/Sources/VLCStreamOutput.m @@ -1,15 +1,30 @@ -// -// VLCStreamOutput.m -// VLCKit -// -// Created by Pierre d'Herbemont on 1/12/08. -// Copyright 2008 __MyCompanyName__. All rights reserved. -// +/***************************************************************************** + * VLCStreamOutput.m: VLCKit.framework VLCStreamOutput implementation + ***************************************************************************** + * Copyright (C) 2008 Pierre d'Herbemont + * Copyright (C) 2008 the VideoLAN team + * $Id$ + * + * Authors: Pierre d'Herbemont + * + * 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 "VLCStreamOutput.h" #import "VLCLibVLCBridging.h" - @implementation VLCStreamOutput - (id)initWithOptionDictionary:(NSDictionary *)dictionary { diff --git a/projects/macosx/framework/Sources/VLCStreamSession.m b/projects/macosx/framework/Sources/VLCStreamSession.m index b83f6d43fc..97ff22656d 100644 --- a/projects/macosx/framework/Sources/VLCStreamSession.m +++ b/projects/macosx/framework/Sources/VLCStreamSession.m @@ -1,10 +1,26 @@ -// -// VLCStreamSession.m -// VLCKit -// -// Created by Pierre d'Herbemont on 1/12/08. -// Copyright 2008 __MyCompanyName__. All rights reserved. -// +/***************************************************************************** + * VLCStreamSession.m: VLCKit.framework VLCStreamSession implementation + ***************************************************************************** + * Copyright (C) 2008 Pierre d'Herbemont + * Copyright (C) 2008 the VideoLAN team + * $Id$ + * + * Authors: Pierre d'Herbemont + * + * 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 "VLCStreamSession.h" #import "VLCLibVLCBridging.h" diff --git a/projects/macosx/framework/Sources/VLCTime.m b/projects/macosx/framework/Sources/VLCTime.m index 68f319791c..566d94b1a9 100644 --- a/projects/macosx/framework/Sources/VLCTime.m +++ b/projects/macosx/framework/Sources/VLCTime.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCTime.h: VLC.framework VLCTime implementation + * VLCTime.m: VLCKit.framework VLCTime implementation ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team diff --git a/projects/macosx/framework/Sources/VLCVideoCommon.m b/projects/macosx/framework/Sources/VLCVideoCommon.m index 312eec342b..a17a9130c3 100644 --- a/projects/macosx/framework/Sources/VLCVideoCommon.m +++ b/projects/macosx/framework/Sources/VLCVideoCommon.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCVideoCommon.m: VLC.framework VLCVideoCommon implementation + * VLCVideoCommon.m: VLCKit.framework VLCVideoCommon implementation ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team @@ -31,14 +31,14 @@ */ @implementation VLCVideoLayoutManager -@synthesize fillScreenEntirely; -@synthesize originalVideoSize; +/* Factories */ + (id)layoutManager { return [[[self alloc] init] autorelease]; } +/* CALayoutManager Impelmentation */ - (void)layoutSublayersOfLayer:(CALayer *)layer { /* After having done everything normally resize the vlcopengllayer */ @@ -60,4 +60,8 @@ videolayer.frame = videoRect; } } + +/* Properties */ +@synthesize fillScreenEntirely; +@synthesize originalVideoSize; @end diff --git a/projects/macosx/framework/Sources/VLCVideoLayer.m b/projects/macosx/framework/Sources/VLCVideoLayer.m index 5121b385b8..5be4df0e76 100644 --- a/projects/macosx/framework/Sources/VLCVideoLayer.m +++ b/projects/macosx/framework/Sources/VLCVideoLayer.m @@ -1,5 +1,5 @@ /***************************************************************************** - * VLCVideoLayer.m: VLC.framework VLCVideoLayer implementation + * VLCVideoLayer.m: VLCKit.framework VLCVideoLayer implementation ***************************************************************************** * Copyright (C) 2007 Pierre d'Herbemont * Copyright (C) 2007 the VideoLAN team -- 2.39.5