dtv: Cosmetics - remove whitespace and correct comments spacing.

[vlc] / modules / access / dtv / dtv.h

diff --git a/modules/access/dtv/dtv.h b/modules/access/dtv/dtv.h
index ac87c644dc2be6f3d74dc12372b679bfc61cae34..6d859248efd59aa24afbbcfed9aafae40b266934 100644 (file)
--- a/modules/access/dtv/dtv.h
+++ b/modules/access/dtv/dtv.h
@@ -5,20 +5,20 @@
 /*****************************************************************************
  * Copyright © 2011 Rémi Denis-Courmont
  *
- * This library 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 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 library is distributed in the hope that it will be useful,
+ * 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 Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, 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 VLC_DTV_H
 # define VLC_DTV_H 1
@@ -28,6 +28,7 @@ extern "C" {
 
 enum {
     ATSC   = 0x00000001,
+    CQAM   = 0x00000002,
 
     DVB_C  = 0x00000010,
     DVB_C2 = 0x00000020,
@@ -35,6 +36,10 @@ enum {
     DVB_S2 = 0x00000080,
     DVB_T  = 0x00000100,
     DVB_T2 = 0x00000200,
+
+    ISDB_C = 0x00001000,
+    ISDB_S = 0x00002000,
+    ISDB_T = 0x00004000,
 };
 
 typedef struct dvb_device dvb_device_t;
@@ -80,30 +85,39 @@ int dvb_set_dvbt (dvb_device_t *, uint32_t freq, const char *mod,
                   int transmission, uint32_t guard, int hierarchy);
 int dvb_set_dvbt2 (dvb_device_t *, uint32_t freq, const char *mod,
                    uint32_t fec, uint32_t bandwidth,
-                   int transmission, uint32_t guard);
+                   int transmission, uint32_t guard, uint32_t plp);
 
 /* ATSC */
 int dvb_set_atsc (dvb_device_t *, uint32_t freq, const char *mod);
 int dvb_set_cqam (dvb_device_t *, uint32_t freq, const char *mod);
 
+/* ISDB-C */
+int dvb_set_isdbc (dvb_device_t *, uint32_t freq, const char *mod,
+                   uint32_t srate, uint32_t fec);
+
+/* ISDB-S */
+/* TODO: modulation? */
+int dvb_set_isdbs (dvb_device_t *, uint64_t freq, uint16_t ts_id);
+
 /* ISDB-T */
 typedef struct isdbt_layer
 {
     const char *modulation;
-    const char *code_rate;
+    uint32_t code_rate;
     uint8_t segment_count;
     uint8_t time_interleaving;
 } isdbt_layer_t;
 
+int dvb_set_isdbt (dvb_device_t *, uint32_t freq, uint32_t bandwidth,
+                   int transmission, uint32_t guard, const isdbt_layer_t[3]);
+
 typedef struct isdbt_sound
 {
     uint8_t subchannel_id;
-    uint8_t segment_index;    uint8_t segment_cound;
+    uint8_t segment_index;
+    uint8_t segment_count;
 } isdbt_sound_t;
 
-int dvb_set_isdbt (dvb_device_t *, uint32_t freq, const isdbt_layer_t *a,
-                   const isdbt_layer_t *b, const isdbt_layer_t *c,
-                   const isdbt_sound_t *sb);
 # ifdef __cplusplus
 }
 # endif