Don't reset master program clock if master program was not selected

[vlc] / src / input / clock.h

diff --git a/src/input/clock.h b/src/input/clock.h
index ef2011976f2e465bad63cac8c73df9bff243f148..ee1492ba7af8eba578a8ce822e3a223817609ab4 100644 (file)
--- a/src/input/clock.h
+++ b/src/input/clock.h
@@ -1,25 +1,25 @@
 /*****************************************************************************
  * clock.h: clocks synchronisation
  *****************************************************************************
- * Copyright (C) 2008 the VideoLAN team
+ * Copyright (C) 2008 VLC authors and VideoLAN
  * Copyright (C) 2008 Laurent Aimar
  * $Id$
  *
  * 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.
  *****************************************************************************/
 
 #ifndef LIBVLC_INPUT_CLOCK_H
@@ -71,12 +71,12 @@ void    input_clock_Reset( input_clock_t * );
 mtime_t input_clock_GetWakeup( input_clock_t * );
 
 /**
- * This functions allows to change the actual reading speed.
+ * This functions allows changing the actual reading speed.
  */
 void    input_clock_ChangeRate( input_clock_t *, int i_rate );
 
 /**
- * This function allows to change the pause status.
+ * This function allows changing the pause status.
  */
 void    input_clock_ChangePause( input_clock_t *, bool b_paused, mtime_t i_date );
 
@@ -87,7 +87,7 @@ void    input_clock_ChangePause( input_clock_t *, bool b_paused, mtime_t i_date
 void    input_clock_GetSystemOrigin( input_clock_t *, mtime_t *pi_system, mtime_t *pi_delay );
 
 /**
- * This function allows to rebase the original system value date (a valid
+ * This function allows rebasing the original system value date (a valid
  * reference point must have been set).
  * When using the absolute mode, it will create a discontinuity unless
  * called imediatly after a input_clock_Update.