aout: remove unused lock

[vlc] / src / input / resource.h

diff --git a/src/input/resource.h b/src/input/resource.h
index b5801fd805be9f636842cb39973e92d124426d4f..339116d95bf70fadee8b0cce3ffdac18beb3354f 100644 (file)
--- a/src/input/resource.h
+++ b/src/input/resource.h
@@ -6,35 +6,26 @@
  *
  * Authors: Laurent Aimar < fenrir _AT_ videolan _DOT_ 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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.
+ * You should have received a copy of the GNU Lesser 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.
  *****************************************************************************/
 
-#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
-# error This header file can only be included from LibVLC.
-#endif
-
-#ifndef _INPUT_RESSOURCE_H
-#define _INPUT_RESSOURCE_H 1
+#ifndef LIBVLC_INPUT_RESOURCE_H
+#define LIBVLC_INPUT_RESOURCE_H 1
 
 #include <vlc_common.h>
 
-/**
- * This function creates an empty input_resource_t.
- */
-input_resource_t *input_resource_New( void );
-
 /**
  * This function set the associated input.
  */
@@ -48,33 +39,42 @@ sout_instance_t *input_resource_RequestSout( input_resource_t *, sout_instance_t
 /**
  * This function handles aout request.
  */
-aout_instance_t *input_resource_RequestAout( input_resource_t *, aout_instance_t * );
+audio_output_t *input_resource_RequestAout( input_resource_t *, audio_output_t * );
 
 /**
- * This function return the current aout if any.
+ * This function returns the current aout if any.
  *
  * You must call vlc_object_release on the value returned (if non NULL).
  */
-aout_instance_t *input_resource_HoldAout( input_resource_t *p_resource );
+audio_output_t *input_resource_HoldAout( input_resource_t *p_resource );
 
 /**
  * This function handles vout request.
  */
-vout_thread_t *input_resource_RequestVout( input_resource_t *, vout_thread_t *, video_format_t *, bool b_recycle );
+vout_thread_t *input_resource_RequestVout( input_resource_t *, vout_thread_t *, video_format_t *, unsigned dpb_size, bool b_recycle );
 
 /**
- * This function return one of the current vout if any.
+ * This function returns one of the current vout if any.
  *
  * You must call vlc_object_release on the value returned (if non NULL).
  */
 vout_thread_t *input_resource_HoldVout( input_resource_t * );
 
 /**
- * This function return all current vouts if any.
+ * This function returns all current vouts if any.
  *
  * You must call vlc_object_release on all values returned (if non NULL).
  */
-void input_resource_HoldVouts( input_resource_t *, vout_thread_t ***, int * );
+void input_resource_HoldVouts( input_resource_t *, vout_thread_t ***, size_t * );
 
-#endif
+/**
+ * This function releases all resources (object).
+ */
+void input_resource_Terminate( input_resource_t * );
+
+/**
+ * This function holds the input_resource_t itself
+ */
+input_resource_t *input_resource_Hold( input_resource_t * );
 
+#endif