diff options
author | Michael Meeks <michael.meeks@suse.com> | 2013-08-21 11:36:15 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2013-08-21 11:37:49 +0100 |
commit | 6bd01307725e73d178efa8e367b6961f581f850c (patch) | |
tree | 926459c7e37232a8b27325180561b17eab1b460f /avmedia | |
parent | dd3a05c0ea59c0d0f14a1b446c8031348fbec195 (diff) |
avmedia: vlc - add / cleanup license headers.
Change-Id: Iac492b75a9646d5ddf0e8b123a27dc6ff6a0f6b8
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/source/vlc/wrapper/EventHandler.cxx | 11 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/EventHandler.hxx | 14 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/EventManager.cxx | 13 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/EventManager.hxx | 15 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/Instance.cxx | 9 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/Instance.hxx | 11 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/Media.cxx | 11 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/Media.hxx | 16 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/Player.cxx | 11 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/Player.hxx | 14 | ||||
-rw-r--r-- | avmedia/source/vlc/wrapper/SymbolLoader.hxx | 13 |
11 files changed, 68 insertions, 70 deletions
diff --git a/avmedia/source/vlc/wrapper/EventHandler.cxx b/avmedia/source/vlc/wrapper/EventHandler.cxx index 42fc0dc623ef..19054d6a15fe 100644 --- a/avmedia/source/vlc/wrapper/EventHandler.cxx +++ b/avmedia/source/vlc/wrapper/EventHandler.cxx @@ -1,3 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #include "EventHandler.hxx" namespace VLC @@ -22,3 +31,5 @@ void EventHandler::execute() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/wrapper/EventHandler.hxx b/avmedia/source/vlc/wrapper/EventHandler.hxx index 50700c2e3b4f..9118da0b9417 100644 --- a/avmedia/source/vlc/wrapper/EventHandler.hxx +++ b/avmedia/source/vlc/wrapper/EventHandler.hxx @@ -5,17 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #ifndef _WRAPPER_EVENT_HANDLER_HXX #define _WRAPPER_EVENT_HANDLER_HXX #include <boost/function.hpp> @@ -39,4 +30,5 @@ namespace VLC } #endif // _WRAPPER_EVENT_HANDLER_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/wrapper/EventManager.cxx b/avmedia/source/vlc/wrapper/EventManager.cxx index 96e86b68bd3c..22881b830653 100644 --- a/avmedia/source/vlc/wrapper/EventManager.cxx +++ b/avmedia/source/vlc/wrapper/EventManager.cxx @@ -1,3 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #include <boost/thread.hpp> #include <vlc/libvlc.h> #include <vlc/libvlc_media.h> @@ -76,6 +85,6 @@ void EventManager::onEndReached( const Callback& callback ) registerSignal( libvlc_MediaPlayerEndReached, callback ); } +} - -}
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/wrapper/EventManager.hxx b/avmedia/source/vlc/wrapper/EventManager.hxx index aad486d7cdee..d0fdd0756583 100644 --- a/avmedia/source/vlc/wrapper/EventManager.hxx +++ b/avmedia/source/vlc/wrapper/EventManager.hxx @@ -5,19 +5,11 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #ifndef _WRAPPER_EVENT_MANAGER_HXX #define _WRAPPER_EVENT_MANAGER_HXX + #include <boost/function.hpp> #include <boost/shared_ptr.hpp> @@ -53,4 +45,5 @@ namespace VLC } #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/wrapper/Instance.cxx b/avmedia/source/vlc/wrapper/Instance.cxx index 4260836c77e5..ea6659ad650a 100644 --- a/avmedia/source/vlc/wrapper/Instance.cxx +++ b/avmedia/source/vlc/wrapper/Instance.cxx @@ -1,4 +1,12 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #include "Instance.hxx" #include "SymbolLoader.hxx" @@ -42,4 +50,5 @@ namespace VLC } } + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/wrapper/Instance.hxx b/avmedia/source/vlc/wrapper/Instance.hxx index 6111262e69d5..15ac0ef590dc 100644 --- a/avmedia/source/vlc/wrapper/Instance.hxx +++ b/avmedia/source/vlc/wrapper/Instance.hxx @@ -5,17 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #ifndef _WRAPPER_INSTANCE_HXX #define _WRAPPER_INSTANCE_HXX diff --git a/avmedia/source/vlc/wrapper/Media.cxx b/avmedia/source/vlc/wrapper/Media.cxx index 6b7e77ed7ed9..dd6c89d032d8 100644 --- a/avmedia/source/vlc/wrapper/Media.cxx +++ b/avmedia/source/vlc/wrapper/Media.cxx @@ -1,3 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #include <rtl/ustring.h> #include "Media.hxx" #include "SymbolLoader.hxx" @@ -56,3 +65,5 @@ Media::~Media() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/wrapper/Media.hxx b/avmedia/source/vlc/wrapper/Media.hxx index 483e60b331ff..4821581c3d7a 100644 --- a/avmedia/source/vlc/wrapper/Media.hxx +++ b/avmedia/source/vlc/wrapper/Media.hxx @@ -5,26 +5,14 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #ifndef _WRAPPER_MEDIA_HXX #define _WRAPPER_MEDIA_HXX struct libvlc_media_t; -namespace rtl -{ - class OUString; -} +namespace rtl { class OUString; } namespace VLC { diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx index d4a25258b7d0..804d41faa757 100644 --- a/avmedia/source/vlc/wrapper/Player.cxx +++ b/avmedia/source/vlc/wrapper/Player.cxx @@ -1,3 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + #include <rtl/ustring.h> #include "Player.hxx" @@ -171,4 +180,4 @@ namespace VLC } } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/wrapper/Player.hxx b/avmedia/source/vlc/wrapper/Player.hxx index a2b17e84d30a..bba169b8c8b4 100644 --- a/avmedia/source/vlc/wrapper/Player.hxx +++ b/avmedia/source/vlc/wrapper/Player.hxx @@ -5,17 +5,8 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #ifndef _WRAPPER_PLAYER_HXX #define _WRAPPER_PLAYER_HXX @@ -72,4 +63,5 @@ namespace VLC } #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx index 0962a3e92894..4608b61013fe 100644 --- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx +++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx @@ -5,19 +5,11 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + #ifndef _SYMBOL_LOADER_HXX #define _SYMBOL_LOADER_HXX + #include <iostream> #include <osl/module.h> #include <rtl/ustring.hxx> @@ -79,4 +71,5 @@ bool InitApiMap( const ApiMap ( &pMap )[N] ) } #endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |