[Libreoffice-commits] core.git: 2 commits - avmedia/Library_avmediavlc.mk avmedia/source
Michael Stahl
mstahl at redhat.com
Mon Jul 13 04:51:38 PDT 2015
avmedia/Library_avmediavlc.mk | 1 -
avmedia/source/vlc/vlcframegrabber.cxx | 18 ++++++++++++++++++
avmedia/source/vlc/vlcframegrabber.hxx | 2 ++
avmedia/source/vlc/vlcplayer.cxx | 19 +++++++++++++++++++
avmedia/source/vlc/vlcwindow.cxx | 18 ++++++++++++++++++
avmedia/source/vlc/vlcwindow.hxx | 2 ++
avmedia/source/vlc/wrapper/Common.cxx | 4 +++-
avmedia/source/vlc/wrapper/ThreadsafeQueue.cxx | 5 -----
avmedia/source/vlc/wrapper/Types.hxx | 7 +++++++
9 files changed, 69 insertions(+), 7 deletions(-)
New commits:
commit 888f51c749bc504f12295433a747dd507723bb56
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jul 13 12:10:08 2015 +0200
avmedia: add some missing license headers to vlc files
Change-Id: Ice9440bec7b0b5a4de2dca1392805130b1048303
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index 05a27c2..bc5d03d 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -1,4 +1,22 @@
/* -*- 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/.
+ *
+ * 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 .
+ */
+
#include <boost/bind.hpp>
#include <iostream>
#include <osl/conditn.hxx>
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx
index 6a34fe3..493a695 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -56,3 +56,5 @@ public:
}
#endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCFRAMEGRABBER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 60d7b87..a8437b2 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -1,3 +1,22 @@
+/* -*- 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/.
+ *
+ * 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 .
+ */
+
#include <boost/bind.hpp>
#include <vcl/syschild.hxx>
#include <vcl/sysdata.hxx>
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index b7b63a8..ffac437 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -1,4 +1,22 @@
/* -*- 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/.
+ *
+ * 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 .
+ */
+
#include <iostream>
#include <cppuhelper/supportsservice.hxx>
#include "vlcwindow.hxx"
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index 6ce10c4..35f2b1f 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -73,3 +73,5 @@ public:
}
#endif // INCLUDED_AVMEDIA_SOURCE_VLC_VLCWINDOW_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/Common.cxx b/avmedia/source/vlc/wrapper/Common.cxx
index 4c28b6d..d021417 100644
--- a/avmedia/source/vlc/wrapper/Common.cxx
+++ b/avmedia/source/vlc/wrapper/Common.cxx
@@ -46,4 +46,6 @@ const char* Common::LastErrorMessage()
}
}
}
-}
\ No newline at end of file
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/wrapper/Types.hxx b/avmedia/source/vlc/wrapper/Types.hxx
index 913aa2b..ff25be3 100644
--- a/avmedia/source/vlc/wrapper/Types.hxx
+++ b/avmedia/source/vlc/wrapper/Types.hxx
@@ -1,4 +1,11 @@
/* -*- 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/.
+ */
/* Typedefs and structures that represent the libvlc API / ABI */
commit 7e6557086610200da61b87f18cb98fe43671edd6
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jul 13 12:09:21 2015 +0200
avmedia: remove empty ThreadsafeQueue.cxx
Change-Id: Icbaea4a55567ce3ab320518fd4a501216c4feb86
diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk
index 15363ee..b8318eb 100644
--- a/avmedia/Library_avmediavlc.mk
+++ b/avmedia/Library_avmediavlc.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediavlc,\
avmedia/source/vlc/wrapper/Player \
avmedia/source/vlc/wrapper/EventManager \
avmedia/source/vlc/wrapper/EventHandler \
- avmedia/source/vlc/wrapper/ThreadsafeQueue \
avmedia/source/vlc/wrapper/Common \
))
diff --git a/avmedia/source/vlc/wrapper/ThreadsafeQueue.cxx b/avmedia/source/vlc/wrapper/ThreadsafeQueue.cxx
deleted file mode 100644
index e2dfdd2..0000000
--- a/avmedia/source/vlc/wrapper/ThreadsafeQueue.cxx
+++ /dev/null
@@ -1,5 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
-#include "ThreadsafeQueue.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list