Commit 1596f942 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Add missing GPL license/copyright statements and whitespace cleanup

parent 37c2c108
...@@ -51,8 +51,6 @@ input_thread_t *libvlc_get_input_thread( libvlc_input_t *p_input, ...@@ -51,8 +51,6 @@ input_thread_t *libvlc_get_input_thread( libvlc_input_t *p_input,
return p_input_thread; return p_input_thread;
} }
/************************************************************************** /**************************************************************************
* Getters for stream information * Getters for stream information
**************************************************************************/ **************************************************************************/
...@@ -213,4 +211,3 @@ int libvlc_input_get_state( libvlc_input_t *p_input, ...@@ -213,4 +211,3 @@ int libvlc_input_get_state( libvlc_input_t *p_input,
return val.i_int; return val.i_int;
} }
...@@ -166,7 +166,6 @@ int mediacontrol_showtext( vout_thread_t *p_vout, int i_channel, ...@@ -166,7 +166,6 @@ int mediacontrol_showtext( vout_thread_t *p_vout, int i_channel,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
void void
mediacontrol_display_text( mediacontrol_Instance *self, mediacontrol_display_text( mediacontrol_Instance *self,
const char * message, const char * message,
......
/*****************************************************************************
* init.c: Core functions : init, playlist, stream management
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* $Id$
*
* Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
*
* 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.
*****************************************************************************/
#define __VLC__ #define __VLC__
#include <mediacontrol_internal.h> #include <mediacontrol_internal.h>
#include <vlc/mediacontrol.h> #include <vlc/mediacontrol.h>
...@@ -40,7 +63,6 @@ mediacontrol_Instance* mediacontrol_new( char** args, mediacontrol_Exception *ex ...@@ -40,7 +63,6 @@ mediacontrol_Instance* mediacontrol_new( char** args, mediacontrol_Exception *ex
ppsz_argv[i_count + 1] = NULL; ppsz_argv[i_count + 1] = NULL;
p_vlc_id = VLC_Create(); p_vlc_id = VLC_Create();
if( p_vlc_id < 0 ) if( p_vlc_id < 0 )
{ {
exception->code = mediacontrol_InternalException; exception->code = mediacontrol_InternalException;
...@@ -49,7 +71,6 @@ mediacontrol_Instance* mediacontrol_new( char** args, mediacontrol_Exception *ex ...@@ -49,7 +71,6 @@ mediacontrol_Instance* mediacontrol_new( char** args, mediacontrol_Exception *ex
} }
p_vlc = ( vlc_object_t* )vlc_current_object( p_vlc_id ); p_vlc = ( vlc_object_t* )vlc_current_object( p_vlc_id );
if( ! p_vlc ) if( ! p_vlc )
{ {
exception->code = mediacontrol_InternalException; exception->code = mediacontrol_InternalException;
...@@ -86,14 +107,12 @@ mediacontrol_Instance* mediacontrol_new( char** args, mediacontrol_Exception *ex ...@@ -86,14 +107,12 @@ mediacontrol_Instance* mediacontrol_new( char** args, mediacontrol_Exception *ex
return NULL; return NULL;
} }
return retval; return retval;
}; }
void void
mediacontrol_exit( mediacontrol_Instance *self ) mediacontrol_exit( mediacontrol_Instance *self )
{ {
vlc_object_release( (vlc_object_t* )self->p_playlist ); vlc_object_release( (vlc_object_t* )self->p_playlist );
vlc_object_release( (vlc_object_t* )self->p_intf ); vlc_object_release( (vlc_object_t* )self->p_intf );
vlc_object_release( (vlc_object_t*)self->p_vlc ); vlc_object_release( (vlc_object_t*)self->p_vlc );
......
/*****************************************************************************
* plugin.c: Core functions : init, playlist, stream management
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* $Id$
*
* Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
*
* 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.
*****************************************************************************/
#include <mediacontrol_internal.h> #include <mediacontrol_internal.h>
#include <vlc/mediacontrol.h> #include <vlc/mediacontrol.h>
#include <vlc/intf.h> #include <vlc/intf.h>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* $Id: core.c 14187 2006-02-07 16:37:40Z courmisch $ * $Id: core.c 14187 2006-02-07 16:37:40Z courmisch $
* *
* Authors: Clment Stenac <zorglub@videolan.org> * Authors: Clent Stenac <zorglub@videolan.org>
* Filippo Carone <littlejohn@videolan.org> * Filippo Carone <littlejohn@videolan.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
...@@ -145,7 +145,6 @@ libvlc_video_take_snapshot( libvlc_input_t *p_input, char *psz_filepath, ...@@ -145,7 +145,6 @@ libvlc_video_take_snapshot( libvlc_input_t *p_input, char *psz_filepath,
{ {
vout_thread_t *p_vout = GetVout( p_input, p_e ); vout_thread_t *p_vout = GetVout( p_input, p_e );
input_thread_t *p_input_thread; input_thread_t *p_input_thread;
char path[256]; char path[256];
/* GetVout will raise the exception for us */ /* GetVout will raise the exception for us */
...@@ -172,7 +171,6 @@ libvlc_video_take_snapshot( libvlc_input_t *p_input, char *psz_filepath, ...@@ -172,7 +171,6 @@ libvlc_video_take_snapshot( libvlc_input_t *p_input, char *psz_filepath,
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
return; return;
} }
int libvlc_video_get_height( libvlc_input_t *p_input, int libvlc_video_get_height( libvlc_input_t *p_input,
...@@ -224,7 +222,6 @@ int libvlc_video_reparent( libvlc_input_t *p_input, libvlc_drawable_t d, ...@@ -224,7 +222,6 @@ int libvlc_video_reparent( libvlc_input_t *p_input, libvlc_drawable_t d,
vlc_object_release( p_vout ); vlc_object_release( p_vout );
return 0; return 0;
} }
void libvlc_video_resize( libvlc_input_t *p_input, int width, int height, libvlc_exception_t *p_e ) void libvlc_video_resize( libvlc_input_t *p_input, int width, int height, libvlc_exception_t *p_e )
...@@ -334,5 +331,4 @@ int libvlc_video_destroy( libvlc_input_t *p_input, ...@@ -334,5 +331,4 @@ int libvlc_video_destroy( libvlc_input_t *p_input,
vout_Destroy( p_vout ); vout_Destroy( p_vout );
return 0; return 0;
} }
...@@ -239,7 +239,6 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name, ...@@ -239,7 +239,6 @@ void libvlc_vlm_change_media( libvlc_instance_t *p_instance, char *psz_name,
void libvlc_vlm_play_media( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_play_media( libvlc_instance_t *p_instance, char *psz_name,
libvlc_exception_t *p_exception ) libvlc_exception_t *p_exception )
{ {
char *psz_message; char *psz_message;
vlm_message_t *answer; vlm_message_t *answer;
...@@ -258,7 +257,6 @@ void libvlc_vlm_play_media( libvlc_instance_t *p_instance, char *psz_name, ...@@ -258,7 +257,6 @@ void libvlc_vlm_play_media( libvlc_instance_t *p_instance, char *psz_name,
void libvlc_vlm_stop_media( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_stop_media( libvlc_instance_t *p_instance, char *psz_name,
libvlc_exception_t *p_exception ) libvlc_exception_t *p_exception )
{ {
char *psz_message; char *psz_message;
vlm_message_t *answer; vlm_message_t *answer;
...@@ -277,7 +275,6 @@ void libvlc_vlm_stop_media( libvlc_instance_t *p_instance, char *psz_name, ...@@ -277,7 +275,6 @@ void libvlc_vlm_stop_media( libvlc_instance_t *p_instance, char *psz_name,
void libvlc_vlm_pause_media( libvlc_instance_t *p_instance, char *psz_name, void libvlc_vlm_pause_media( libvlc_instance_t *p_instance, char *psz_name,
libvlc_exception_t *p_exception ) libvlc_exception_t *p_exception )
{ {
char *psz_message; char *psz_message;
vlm_message_t *answer; vlm_message_t *answer;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment