summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/input/libdvdnav/dvdnav.c7
-rw-r--r--src/input/libdvdnav/vm.c7
-rw-r--r--src/input/libdvdread/nav_print.c4
-rw-r--r--src/input/libdvdread/nav_read.c10
-rw-r--r--src/input/libdvdread/nav_types.h38
5 files changed, 36 insertions, 30 deletions
diff --git a/src/input/libdvdnav/dvdnav.c b/src/input/libdvdnav/dvdnav.c
index 7e209d3a8..5db3257f3 100644
--- a/src/input/libdvdnav/dvdnav.c
+++ b/src/input/libdvdnav/dvdnav.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dvdnav.c,v 1.8 2002/09/20 12:53:53 mroi Exp $
+ * $Id: dvdnav.c,v 1.9 2002/10/22 04:39:01 storri Exp $
*
*/
@@ -794,7 +794,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, unsigned char **buf,
}
- //result = DVDReadBlocks(this->file, this->vobu.vobu_start + this->vobu.vobu_next, 1, buf);
+ /* result = DVDReadBlocks(this->file, this->vobu.vobu_start + this->vobu.vobu_next, 1, buf); */
result = dvdnav_read_cache_block(this->cache, this->vobu.vobu_start + this->vobu.vobu_next, 1, buf);
if(result <= 0) {
@@ -1010,6 +1010,9 @@ uint32_t dvdnav_get_next_still_flag(dvdnav_t *this) {
/*
* $Log: dvdnav.c,v $
+ * Revision 1.9 2002/10/22 04:39:01 storri
+ * Changed comments to standard /* ... */
+ *
* Revision 1.8 2002/09/20 12:53:53 mroi
* sync to latest libdvdnav cvs version
*
diff --git a/src/input/libdvdnav/vm.c b/src/input/libdvdnav/vm.c
index 2a21a8499..f5e75c4a9 100644
--- a/src/input/libdvdnav/vm.c
+++ b/src/input/libdvdnav/vm.c
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: vm.c,v 1.6 2002/09/20 12:53:53 mroi Exp $
+ * $Id: vm.c,v 1.7 2002/10/22 04:39:30 storri Exp $
*
*/
@@ -1741,7 +1741,7 @@ static int set_VTS_PTT(vm_t *vm, int vtsN, int /* is this really */ vts_ttn, int
(vm->state).vtsN = vtsN; /* Not sure about this one. We can get to it easily from TTN_REG */
/* Any other registers? */
- res = set_PGC(vm, pgcN); // This clobber's state.pgN (sets it to 1), but we don't want clobbering here.
+ res = set_PGC(vm, pgcN); /* This clobber's state.pgN (sets it to 1), but we don't want clobbering here. */
(vm->state).pgN = pgN; /* Part?? */
return res;
}
@@ -1988,6 +1988,9 @@ static pgcit_t* get_PGCIT(vm_t *vm) {
/*
* $Log: vm.c,v $
+ * Revision 1.7 2002/10/22 04:39:30 storri
+ * Changed comments to standard /* ... */
+ *
* Revision 1.6 2002/09/20 12:53:53 mroi
* sync to latest libdvdnav cvs version
*
diff --git a/src/input/libdvdread/nav_print.c b/src/input/libdvdread/nav_print.c
index 3c9630cc1..210829a4c 100644
--- a/src/input/libdvdread/nav_print.c
+++ b/src/input/libdvdread/nav_print.c
@@ -27,7 +27,7 @@
#include <inttypes.h>
#include <assert.h>
-#include "config.h" // Needed for WORDS_BIGENDIAN
+#include "config.h" /* Needed for WORDS_BIGENDIAN */
#include "nav_types.h"
#include "nav_print.h"
@@ -167,7 +167,7 @@ static void navPrint_BTNIT(btni_t *btni_table, int btngr_ns, int btn_ns) {
printf("left %d, ", btni->left);
printf("right %d\n", btni->right);
- // ifoPrint_COMMAND(&btni->cmd);
+ /* ifoPrint_COMMAND(&btni->cmd); */
printf("\n");
}
}
diff --git a/src/input/libdvdread/nav_read.c b/src/input/libdvdread/nav_read.c
index b8d93ff54..abaf94b13 100644
--- a/src/input/libdvdread/nav_read.c
+++ b/src/input/libdvdread/nav_read.c
@@ -21,7 +21,7 @@
#include <inttypes.h>
#include <assert.h>
-#include "config.h" // Needed for WORDS_BIGENDIAN
+#include "config.h" /* Needed for WORDS_BIGENDIAN */
#include "bswap.h"
#include "nav_types.h"
#include "nav_read.h"
@@ -33,7 +33,7 @@
void navRead_PCI(pci_t *pci, unsigned char *buffer) {
int i, j;
- assert(sizeof(pci_t) == PCI_BYTES - 1); // -1 for substream id
+ assert(sizeof(pci_t) == PCI_BYTES - 1); /* -1 for substream id */
memcpy(pci, buffer, sizeof(pci_t));
@@ -116,7 +116,7 @@ void navRead_PCI(pci_t *pci, unsigned char *buffer) {
assert(pci->hli.btnit[n].down <= pci->hli.hl_gi.btn_ns);
assert(pci->hli.btnit[n].left <= pci->hli.hl_gi.btn_ns);
assert(pci->hli.btnit[n].right <= pci->hli.hl_gi.btn_ns);
- //vmcmd_verify(pci->hli.btnit[n].cmd);
+ /* vmcmd_verify(pci->hli.btnit[n].cmd); */
} else {
assert(pci->hli.btnit[n].btn_coln == 0);
assert(pci->hli.btnit[n].auto_action_mode == 0);
@@ -129,7 +129,7 @@ void navRead_PCI(pci_t *pci, unsigned char *buffer) {
assert(pci->hli.btnit[n].left == 0);
assert(pci->hli.btnit[n].right == 0);
for (k = 0; k < 8; k++)
- assert(pci->hli.btnit[n].cmd.bytes[k] == 0); //CHECK_ZERO?
+ assert(pci->hli.btnit[n].cmd.bytes[k] == 0); /* CHECK_ZERO? */
}
}
}
@@ -139,7 +139,7 @@ void navRead_PCI(pci_t *pci, unsigned char *buffer) {
void navRead_DSI(dsi_t *dsi, unsigned char *buffer) {
int i;
- assert(sizeof(dsi_t) == DSI_BYTES - 1); // -1 for substream id
+ assert(sizeof(dsi_t) == DSI_BYTES - 1); /* -1 for substream id */
memcpy(dsi, buffer, sizeof(dsi_t));
diff --git a/src/input/libdvdread/nav_types.h b/src/input/libdvdread/nav_types.h
index ba46f7451..2400bbd99 100644
--- a/src/input/libdvdread/nav_types.h
+++ b/src/input/libdvdread/nav_types.h
@@ -30,7 +30,7 @@
*/
#include <inttypes.h>
-#include "ifo_types.h" // only dvd_time_t, vm_cmd_t and user_ops_t
+#include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */
#undef ATTRIBUTE_PACKED
@@ -92,7 +92,7 @@ typedef struct {
* Highlight General Information
*/
typedef struct {
- uint16_t hli_ss; ///< only low 2 bits
+ uint16_t hli_ss; /* < only low 2 bits */
uint32_t hli_s_ptm;
uint32_t hli_e_ptm;
uint32_t btn_se_e_ptm;
@@ -116,11 +116,11 @@ typedef struct {
unsigned int zero3 : 1;
#endif
uint8_t btn_ofn;
- uint8_t btn_ns; ///< only low 6 bits
- uint8_t nsl_btn_ns; ///< only low 6 bits
+ uint8_t btn_ns; /* < only low 6 bits */
+ uint8_t nsl_btn_ns; /* < only low 6 bits */
uint8_t zero5;
- uint8_t fosl_btnn; ///< only low 6 bits
- uint8_t foac_btnn; ///< only low 6 bits
+ uint8_t fosl_btnn; /* < only low 6 bits */
+ uint8_t foac_btnn; /* < only low 6 bits */
} ATTRIBUTE_PACKED hl_gi_t;
@@ -217,12 +217,12 @@ typedef struct {
* Seamless Playback Information
*/
typedef struct {
- uint16_t category; ///< category of seamless VOBU
- uint32_t ilvu_ea; ///< end address of interleaved Unit (sectors)
- uint32_t ilvu_sa; ///< start address of next interleaved unit (sectors)
- uint16_t size; ///< size of next interleaved unit (sectors)
- uint32_t vob_v_s_s_ptm; ///< video start ptm in vob
- uint32_t vob_v_e_e_ptm; ///< video end ptm in vob
+ uint16_t category; /* category of seamless VOBU */
+ uint32_t ilvu_ea; /* end address of interleaved Unit (sectors) */
+ uint32_t ilvu_sa; /* start address of next interleaved unit (sectors) */
+ uint16_t size; /* size of next interleaved unit (sectors) */
+ uint32_t vob_v_s_s_ptm; /* video start ptm in vob */
+ uint32_t vob_v_e_e_ptm; /* video end ptm in vob */
struct {
uint32_t stp_ptm1;
uint32_t stp_ptm2;
@@ -235,8 +235,8 @@ typedef struct {
* Seamless Angle Infromation for one angle
*/
typedef struct {
- uint32_t address; ///< Sector offset to next ILVU, high bit is before/after
- uint16_t size; ///< Byte size of the ILVU poited to by address.
+ uint32_t address; /* Sector offset to next ILVU, high bit is before/after */
+ uint16_t size; /* Byte size of the ILVU poited to by address. */
} ATTRIBUTE_PACKED sml_agl_data_t;
/**
@@ -250,11 +250,11 @@ typedef struct {
* VOBU Search Information
*/
typedef struct {
- uint32_t next_video; ///< Next vobu that contains video
- uint32_t fwda[19]; ///< Forwards, time
+ uint32_t next_video; /* Next vobu that contains video */
+ uint32_t fwda[19]; /* Forwards, time */
uint32_t next_vobu;
uint32_t prev_vobu;
- uint32_t bwda[19]; ///< Backwards, time
+ uint32_t bwda[19]; /* Backwards, time */
uint32_t prev_video;
} ATTRIBUTE_PACKED vobu_sri_t;
@@ -264,8 +264,8 @@ typedef struct {
* Synchronous Information
*/
typedef struct {
- uint16_t a_synca[8]; ///< Sector offset to first audio packet for this VOBU
- uint32_t sp_synca[32]; ///< Sector offset to first subpicture packet
+ uint16_t a_synca[8]; /* Sector offset to first audio packet for this VOBU */
+ uint32_t sp_synca[32]; /* Sector offset to first subpicture packet */
} ATTRIBUTE_PACKED synci_t;
/**
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 11:37:31 +0000