http://blog.gmane.org/gmane.comp.video.dvdnav.general hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://comments.gmane.org/gmane.comp.video.dvdnav.general/704 Hi/2. I've attached patches for OS/2 support for libdvdread and libdvdnav. And I modifed 'examples/menus.c' to allow to specify DVD device as a argument. KO Myung-Hun 2008-10-06T14:46:19 http://comments.gmane.org/gmane.comp.video.dvdnav.general/699 _______________________________________________ DVDnav-discuss mailing list DVDnav-discuss-4+PuYLO5yA7jufZW15ZwLg< at >public.gmane.org https://lists.mplayerhq.hu/mailman/listinfo/dvdnav-discuss jezz-ipqgqjuauFcdnm+yROfE0A< at >public.gmane.org 2008-10-05T14:56:14 http://comments.gmane.org/gmane.comp.video.dvdnav.general/696 _______________________________________________ DVDnav-discuss mailing list DVDnav-discuss-4+PuYLO5yA7jufZW15ZwLg< at >public.gmane.org https://lists.mplayerhq.hu/mailman/listinfo/dvdnav-discuss Charles philip Chan 2008-10-03T14:06:55 http://comments.gmane.org/gmane.comp.video.dvdnav.general/695 Author: diego Date: Sun Sep 28 17:56:44 2008 New Revision: 1153 Log: Remove remaining tabs and trailing whitespace. Modified: trunk/libdvdread/COPYING trunk/libdvdread/configure.ac Modified: trunk/libdvdread/COPYING ============================================================================== --- trunk/libdvdread/COPYING(original) +++ trunk/libdvdread/COPYINGSun Sep 28 17:56:44 2008 < at >< at > -1,12 +1,12 < at >< at > - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public < at >< at > -56,7 +56,7 < at >< at > patent must be licensed for everyone's f The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains < at >< at > -255,7 +255,7 < at >< at > make exceptions for this. Our decision of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN < at >< at > -277,9 +277,9 < at >< at > YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it Modified: trunk/libdvdread/configure.ac ============================================================================== --- trunk/libdvdread/configure.ac(original) +++ trunk/libdvdread/configure.acSun Sep 28 17:56:44 2008 < at >< at > -35,7 +35,7 < at >< at > AC_SUBST(DVDREAD_MINOR) AC_SUBST(DVDREAD_SUB) dnl The libtool version numbers (DVDREAD_LT_*); Don't even think about faking this! -dnl +dnl dnl immediately before every release do: dnl =================================== dnl if (the interface is totally unchanged from previous release) < at >< at > -48,7 +48,7 < at >< at > dnl AGE ++; dnl if (any interfaces have been _removed_ or _incompatibly changed_) dnl AGE = 0; dnl } -dnl +dnl dnl If you want to know more about what you are doing, here are some details: dnl * DVDREAD_LT_CURRENT is the current API version dnl * DVDREAD_LT_REVISION is an internal revision number which is increased when the API < at >< at > -147,10 +147,10 < at >< at > case $host in ;; *) AC_CHECK_LIB(c, dlopen, - DYNAMIC_LD_LIBS="", - AC_CHECK_LIB(dl, dlopen, - DYNAMIC_LD_LIBS="-ldl", - AC_MSG_ERROR(dynamic linker needed))) + DYNAMIC_LD_LIBS="", + AC_CHECK_LIB(dl, dlopen, + DYNAMIC_LD_LIBS="-ldl", + AC_MSG_ERROR(dynamic linker needed))) AC_SUBST(DYNAMIC_LD_LIBS) ;; esac < at >< at > -199,7 +199,7 < at >< at > dnl ------------------------------------ dnl Output configuration files dnl --------------------------------------------- AC_OUTPUT([ -Makefile +Makefile src/Makefile misc/Makefile misc/dvdread-config diego 2008-09-28T15:56:44 http://comments.gmane.org/gmane.comp.video.dvdnav.general/693 This is more of a user question and I'm debating about whether to direct this to mplayer-users or here, but I'll send it here and see what kind of response I get. I just got libdvdnav and libdvdread externals (from this SVN) going with mplayer and I've found the very annoying side effect of libdvdcss being not included. If you use external libdvdnav and libdvdread does this break inclusion of the libdvdcss or is libdvdcss compiled in at libdvdread and libdvdnav compile time? If so is the suggested course of action to go intstall an external libdvdcss or could I also use the internal libdvdcss from mplayer directly into libdvdnav/libdvdread. Ergzay 2008-09-28T08:55:33 http://comments.gmane.org/gmane.comp.video.dvdnav.general/692 Author: diego Date: Fri Sep 26 00:09:59 2008 New Revision: 1152 Log: cosmetics: function renaming from libdvdread 0.9.5 Modified: trunk/libdvdread/src/ifo_print.c Modified: trunk/libdvdread/src/ifo_print.c ============================================================================== --- trunk/libdvdread/src/ifo_print.c(original) +++ trunk/libdvdread/src/ifo_print.cFri Sep 26 00:09:59 2008 < at >< at > -426,7 +426,7 < at >< at > static void ifo_print_subp_attributes(in } -static void ifo_print_USER_OPS(user_ops_t *user_ops) { +static void ifoPrint_USER_OPS(user_ops_t *user_ops) { uint32_t uops; unsigned char *ptr = (unsigned char *)user_ops; < at >< at > -495,7 +495,7 < at >< at > static void ifo_print_USER_OPS(user_ops_ } -void ifo_print_VMGI_MAT(vmgi_mat_t *vmgi_mat) { +void ifoPrint_VMGI_MAT(vmgi_mat_t *vmgi_mat) { printf("VMG Identifier: %.12s\n", vmgi_mat->vmg_identifier); printf("Last Sector of VMG: %08x\n", vmgi_mat->vmg_last_sector); < at >< at > -544,7 +544,7 < at >< at > void ifo_print_VMGI_MAT(vmgi_mat_t *vmgi } -void ifo_print_VTSI_MAT(vtsi_mat_t *vtsi_mat) { +void ifoPrint_VTSI_MAT(vtsi_mat_t *vtsi_mat) { int i; printf("VTS Identifier: %.12s\n", vtsi_mat->vts_identifier); < at >< at > -608,7 +608,7 < at >< at > void ifo_print_VTSI_MAT(vtsi_mat_t *vtsi } -static void ifo_print_PGC_COMMAND_TBL(pgc_command_tbl_t *cmd_tbl) { +static void ifoPrint_PGC_COMMAND_TBL(pgc_command_tbl_t *cmd_tbl) { int i; if(cmd_tbl == NULL) { < at >< at > -633,7 +633,7 < at >< at > static void ifo_print_PGC_COMMAND_TBL(pg } -static void ifo_print_PGC_PROGRAM_MAP(pgc_program_map_t *program_map, int nr) { +static void ifoPrint_PGC_PROGRAM_MAP(pgc_program_map_t *program_map, int nr) { int i; if(program_map == NULL) { < at >< at > -647,7 +647,7 < at >< at > static void ifo_print_PGC_PROGRAM_MAP(pg } -static void ifo_print_CELL_PLAYBACK(cell_playback_t *cell_playback, int nr) { +static void ifoPrint_CELL_PLAYBACK(cell_playback_t *cell_playback, int nr) { int i; if(cell_playback == NULL) { < at >< at > -717,7 +717,7 < at >< at > static void ifo_print_CELL_PLAYBACK(cell } } -static void ifo_print_CELL_POSITION(cell_position_t *cell_position, int nr) { +static void ifoPrint_CELL_POSITION(cell_position_t *cell_position, int nr) { int i; if(cell_position == NULL) { < at >< at > -732,7 +732,7 < at >< at > static void ifo_print_CELL_POSITION(cell } -void ifo_print_PGC(pgc_t *pgc) { +void ifoPrint_PGC(pgc_t *pgc) { int i; if (!pgc) { < at >< at > -747,7 +747,7 < at >< at > void ifo_print_PGC(pgc_t *pgc) { /* If no programs/no time then does this mean anything? */ printf("Prohibited user operations: "); - ifo_print_USER_OPS(&pgc->prohibited_ops); + ifoPrint_USER_OPS(&pgc->prohibited_ops); for(i = 0; i < 8; i++) { if(pgc->audio_control[i] & 0x8000) { /* The 'is present' bit */ < at >< at > -782,14 +782,14 < at >< at > void ifo_print_PGC(pgc_t *pgc) { } /* Memmory offsets to div. tables. */ - ifo_print_PGC_COMMAND_TBL(pgc->command_tbl); - ifo_print_PGC_PROGRAM_MAP(pgc->program_map, pgc->nr_of_programs); - ifo_print_CELL_PLAYBACK(pgc->cell_playback, pgc->nr_of_cells); - ifo_print_CELL_POSITION(pgc->cell_position, pgc->nr_of_cells); + ifoPrint_PGC_COMMAND_TBL(pgc->command_tbl); + ifoPrint_PGC_PROGRAM_MAP(pgc->program_map, pgc->nr_of_programs); + ifoPrint_CELL_PLAYBACK(pgc->cell_playback, pgc->nr_of_cells); + ifoPrint_CELL_POSITION(pgc->cell_position, pgc->nr_of_cells); } -void ifo_print_TT_SRPT(tt_srpt_t *tt_srpt) { +void ifoPrint_TT_SRPT(tt_srpt_t *tt_srpt) { int i; printf("Number of TitleTrack search pointers: %i\n", < at >< at > -822,7 +822,7 < at >< at > void ifo_print_TT_SRPT(tt_srpt_t *tt_srp } -void ifo_print_VTS_PTT_SRPT(vts_ptt_srpt_t *vts_ptt_srpt) { +void ifoPrint_VTS_PTT_SRPT(vts_ptt_srpt_t *vts_ptt_srpt) { int i, j; printf(" nr_of_srpts %i last byte %i\n", vts_ptt_srpt->nr_of_srpts, < at >< at > -843,7 +843,7 < at >< at > static void hexdump(uint8_t *ptr, int le printf("%02x ", *ptr++); } -void ifo_print_PTL_MAIT(ptl_mait_t *ptl_mait) { +void ifoPrint_PTL_MAIT(ptl_mait_t *ptl_mait) { int i, j; printf("Number of Countries: %i\n", ptl_mait->nr_of_countries); < at >< at > -872,7 +872,7 < at >< at > void ifo_print_PTL_MAIT(ptl_mait_t *ptl_ } } -void ifo_print_VTS_TMAPT(vts_tmapt_t *vts_tmapt) { +void ifoPrint_VTS_TMAPT(vts_tmapt_t *vts_tmapt) { unsigned int timeunit; int i, j; < at >< at > -895,7 +895,7 < at >< at > void ifo_print_VTS_TMAPT(vts_tmapt_t *vt } } -void ifo_print_C_ADT(c_adt_t *c_adt) { +void ifoPrint_C_ADT(c_adt_t *c_adt) { int i, entries; printf("Number of VOBs in this VOBS: %i\n", c_adt->nr_of_vobs); < at >< at > -912,7 +912,7 < at >< at > void ifo_print_C_ADT(c_adt_t *c_adt) { } -void ifo_print_VOBU_ADMAP(vobu_admap_t *vobu_admap) { +void ifoPrint_VOBU_ADMAP(vobu_admap_t *vobu_admap) { int i, entries; entries = (vobu_admap->last_byte + 1 - VOBU_ADMAP_SIZE)/4; < at >< at > -952,7 +952,7 < at >< at > const char *ifo_print_menu_name(int type } /* pgc_type=1 for menu, 0 for title. */ -void ifo_print_PGCIT(pgcit_t *pgcit, int pgc_type) { +void ifoPrint_PGCIT(pgcit_t *pgcit, int pgc_type) { int i; printf("\nNumber of Program Chains: %3i\n", pgcit->nr_of_pgci_srp); < at >< at > -971,12 +971,12 < at >< at > void ifo_print_PGCIT(pgcit_t *pgcit, int pgcit->pgci_srp[i].entry_id); } printf("Parental ID mask 0x%04x\n", pgcit->pgci_srp[i].ptl_id_mask); - ifo_print_PGC(pgcit->pgci_srp[i].pgc); + ifoPrint_PGC(pgcit->pgci_srp[i].pgc); } } -void ifo_print_PGCI_UT(pgci_ut_t *pgci_ut) { +void ifoPrint_PGCI_UT(pgci_ut_t *pgci_ut) { int i, menu; printf("Number of Menu Language Units (PGCI_LU): %3i\n", pgci_ut->nr_of_lus); < at >< at > -1016,12 +1016,12 < at >< at > void ifo_print_PGCI_UT(pgci_ut_t *pgci_u menu^=0x08; } printf("\n"); - ifo_print_PGCIT(pgci_ut->lu[i].pgcit, 1); + ifoPrint_PGCIT(pgci_ut->lu[i].pgcit, 1); } } -static void ifo_print_VTS_ATTRIBUTES(vts_attributes_t *vts_attributes) { +static void ifoPrint_VTS_ATTRIBUTES(vts_attributes_t *vts_attributes) { int i; printf("VTS_CAT Application type: %08x\n", vts_attributes->vts_cat); < at >< at > -1065,13 +1065,13 < at >< at > static void ifo_print_VTS_ATTRIBUTES(vts } -void ifo_print_VTS_ATRT(vts_atrt_t *vts_atrt) { +void ifoPrint_VTS_ATRT(vts_atrt_t *vts_atrt) { int i; printf("Number of Video Title Sets: %3i\n", vts_atrt->nr_of_vtss); for(i = 0; i < vts_atrt->nr_of_vtss; i++) { printf("\nVideo Title Set %i\n", i + 1); - ifo_print_VTS_ATTRIBUTES(&vts_atrt->vts[i]); + ifoPrint_VTS_ATTRIBUTES(&vts_atrt->vts[i]); } } < at >< at > -1089,22 +1089,22 < at >< at > void ifo_print(dvd_reader_t *dvd, int ti if(ifohandle->vmgi_mat) { printf("VMG top level\n-------------\n"); - ifo_print_VMGI_MAT(ifohandle->vmgi_mat); + ifoPrint_VMGI_MAT(ifohandle->vmgi_mat); printf("\nFirst Play PGC\n--------------\n"); if(ifohandle->first_play_pgc) - ifo_print_PGC(ifohandle->first_play_pgc); + ifoPrint_PGC(ifohandle->first_play_pgc); else printf("No First Play PGC present\n"); printf("\nTitle Track search pointer table\n"); printf( "------------------------------------------------\n"); - ifo_print_TT_SRPT(ifohandle->tt_srpt); + ifoPrint_TT_SRPT(ifohandle->tt_srpt); printf("\nMenu PGCI Unit table\n"); printf( "--------------------\n"); if(ifohandle->pgci_ut) { - ifo_print_PGCI_UT(ifohandle->pgci_ut); + ifoPrint_PGCI_UT(ifohandle->pgci_ut); } else { printf("No PGCI Unit table present\n"); } < at >< at > -1112,14 +1112,14 < at >< at > void ifo_print(dvd_reader_t *dvd, int ti printf("\nParental Manegment Information table\n"); printf( "------------------------------------\n"); if(ifohandle->ptl_mait) { - ifo_print_PTL_MAIT(ifohandle->ptl_mait); + ifoPrint_PTL_MAIT(ifohandle->ptl_mait); } else { printf("No Parental Management Information present\n"); } printf("\nVideo Title Set Attribute Table\n"); printf( "-------------------------------\n"); - ifo_print_VTS_ATRT(ifohandle->vts_atrt); + ifoPrint_VTS_ATRT(ifohandle->vts_atrt); printf("\nText Data Manager Information\n"); printf( "-----------------------------\n"); < at >< at > -1132,7 +1132,7 < at >< at > void ifo_print(dvd_reader_t *dvd, int ti printf("\nMenu Cell Adress table\n"); printf( "-----------------\n"); if(ifohandle->menu_c_adt) { - ifo_print_C_ADT(ifohandle->menu_c_adt); + ifoPrint_C_ADT(ifohandle->menu_c_adt); } else { printf("No Menu Cell Adress table present\n"); } < at >< at > -1140,7 +1140,7 < at >< at > void ifo_print(dvd_reader_t *dvd, int ti printf("\nVideo Manager Menu VOBU address map\n"); printf( "-----------------\n"); if(ifohandle->menu_vobu_admap) { - ifo_print_VOBU_ADMAP(ifohandle->menu_vobu_admap); + ifoPrint_VOBU_ADMAP(ifohandle->menu_vobu_admap); } else { printf("No Menu VOBU address map present\n"); } < at >< at > -1150,20 +1150,20 < at >< at > void ifo_print(dvd_reader_t *dvd, int ti if(ifohandle->vtsi_mat) { printf("VTS top level\n-------------\n"); - ifo_print_VTSI_MAT(ifohandle->vtsi_mat); + ifoPrint_VTSI_MAT(ifohandle->vtsi_mat); printf("\nPart of Title Track search pointer table\n"); printf( "----------------------------------------------\n"); - ifo_print_VTS_PTT_SRPT(ifohandle->vts_ptt_srpt); + ifoPrint_VTS_PTT_SRPT(ifohandle->vts_ptt_srpt); printf("\nPGCI Unit table\n"); printf( "--------------------\n"); - ifo_print_PGCIT(ifohandle->vts_pgcit, 0); + ifoPrint_PGCIT(ifohandle->vts_pgcit, 0); printf("\nMenu PGCI Unit table\n"); printf( "--------------------\n"); if(ifohandle->pgci_ut) { - ifo_print_PGCI_UT(ifohandle->pgci_ut); + ifoPrint_PGCI_UT(ifohandle->pgci_ut); } else { printf("No Menu PGCI Unit table present\n"); } < at >< at > -1171,7 +1171,7 < at >< at > void ifo_print(dvd_reader_t *dvd, int ti printf("\nVTS Time Map table\n"); printf( "-----------------\n"); if(ifohandle->vts_tmapt) { - ifo_print_VTS_TMAPT(ifohandle->vts_tmapt); + ifoPrint_VTS_TMAPT(ifohandle->vts_tmapt); } else { printf("No VTS Time Map table present\n"); } < at >< at > -1179,7 +1179,7 < at >< at > void ifo_print(dvd_reader_t *dvd, int ti printf("\nMenu Cell Adress table\n"); printf( "-----------------\n"); if(ifohandle->menu_c_adt) { - ifo_print_C_ADT(ifohandle->menu_c_adt); + ifoPrint_C_ADT(ifohandle->menu_c_adt); } else { printf("No Cell Adress table present\n"); } < at >< at > -1187,18 +1187,18 < at >< at > void ifo_print(dvd_reader_t *dvd, int ti printf("\nVideo Title Set Menu VOBU address map\n"); printf( "-----------------\n"); if(ifohandle->menu_vobu_admap) { - ifo_print_VOBU_ADMAP(ifohandle->menu_vobu_admap); + ifoPrint_VOBU_ADMAP(ifohandle->menu_vobu_admap); } else { printf("No Menu VOBU address map present\n"); } printf("\nCell Adress table\n"); printf( "-----------------\n"); - ifo_print_C_ADT(ifohandle->vts_c_adt); + ifoPrint_C_ADT(ifohandle->vts_c_adt); printf("\nVideo Title Set VOBU address map\n"); printf( "-----------------\n"); - ifo_print_VOBU_ADMAP(ifohandle->vts_vobu_admap); + ifoPrint_VOBU_ADMAP(ifohandle->vts_vobu_admap); } ifoClose(ifohandle); diego 2008-09-25T22:09:59 http://comments.gmane.org/gmane.comp.video.dvdnav.general/691 Author: diego Date: Fri Sep 26 00:08:45 2008 New Revision: 1151 Log: cosmetics: one more hunk of indentation sync Modified: trunk/libdvdread/src/ifo_print.c Modified: trunk/libdvdread/src/ifo_print.c ============================================================================== --- trunk/libdvdread/src/ifo_print.c(original) +++ trunk/libdvdread/src/ifo_print.cFri Sep 26 00:08:45 2008 < at >< at > -749,12 +749,12 < at >< at > void ifo_print_PGC(pgc_t *pgc) { printf("Prohibited user operations: "); ifo_print_USER_OPS(&pgc->prohibited_ops); - for(i = 0; i < 8; i++) { - if(pgc->audio_control[i] & 0x8000) { /* The 'is present' bit */ - printf("Audio stream %i control: %04x\n", - i, pgc->audio_control[i]); - } + for(i = 0; i < 8; i++) { + if(pgc->audio_control[i] & 0x8000) { /* The 'is present' bit */ + printf("Audio stream %i control: %04x\n", + i, pgc->audio_control[i]); } + } for(i = 0; i < 32; i++) { if(pgc->subp_control[i] & 0x80000000) { /* The 'is present' bit */ diego 2008-09-25T22:08:45 http://comments.gmane.org/gmane.comp.video.dvdnav.general/674 What are the plans regarding libdvdread? The version that was released here is based on libdvdread 0.9.4 (IIRC), but upstream has reached 0.9.7 in the meantime. Is there intention to sync both versions? Diego Diego Biurrun 2008-09-18T07:20:17 http://comments.gmane.org/gmane.comp.video.dvdnav.general/672 Hello list, So as a status update to my progress. I think my patching is probably quite different from your average libdvdread user, so there would probably too much work to include them in mplayers repository. But they are all available on my public CVS should someone else be seeking the same information. I have found the following patches needed; 1. Back-ported the DVDFileStat() functions so I can get VOB filesizes more easily. 2. Added ExtFileInfo (262) support for UDF2.50 3. Added Filetype 250, which seems to be a homegrown re-direct block, this enables libdvdread to process UDF2.50 images. 4. Unfortunately, libdvdread developers cheated an used "struct AD" both for AD use, and to carry back file-size information. AD's Location (number of blocks) is correctly 32bits, but filesizes in UDF are 64bit. Since DVD images are always <= 1GB, this has not been a problem so far. I updated "struct AD" to also have a 64bit value for filesize, which is not the correct solution, but the one with the least changes. 5. Unfortunately, libdvdread developers cheated when reading AD's from FileInfo data. It will parse them all, and return the last one found. Again, because DVDs are <= 1GB, there is only one AD chained and hence, no problem. For UDF2.50, and larger files, I needed extra patching to fetch the correct chain. Not entirely sure how best to fix this yet. 6. Since I can't really parse BD-ISO with "domain, title, part", I implemented opendir/readdir/closedir API functions. I used POSIX extension dt_type for quick type testing, and hacked in dt_filesize to save on stat() API calls. But perhaps, stat() should also be implemented. 7. Added DVDOpenFilename() to allow opening of a direct filename instead of "domain, title, part". 8. DVDFileSize() will return very strange values, and I find it hard to believe that it will ever return the correct number. (Generally only used for .IFO files). Anyone actually used it? 9. Added dvd_input methods for popen()ing "unrar" allowing for direct ISO access inside RAR storage container. That is all for now. Lund Jorgen Lundman 2008-09-18T03:52:11 http://comments.gmane.org/gmane.comp.video.dvdnav.general/664 Hi, recently I found out about the release of the forked libdvdread library, which is actually a good thing since the original lib seems to be dead. I did not switch to the forked version yet, but will try it soon. In the meantime I have a couple of questions and I hope that you guys can help me out. I am one of the authors of MediaTomb (UPnP media server project), currently we are adding a feature that should allow users to watch DVDs on their UPnP players. The idea is to parse the DVD or a DVD iso and create a structure of virtual objects and containers on the server, which consist of titles, chapters, audio tracks/languages. Selecting those for playback would extract the corresponding MPEG stream from the DVD and offer it via HTTP to the UPnP player. It was quite a pain to figure out how to use the library, play_title.c from libdvdread 0.9.7 was a great help, btw I noticed that it is no longer included in the forked release. So first question: are there any plans to add a somewhat higher level, easier to use API? In the end I was able to get an MPEG stream, matching my title/chatper/angle selection from the DVD via libdvdread. Implementing seeking support is next on my list, most UPnP players do this via HTTP range requests, so I need to know the size of the stream in bytes. And here is the problem: in order to get the exact size I need to read nav packets, then parse the dsi packets and basically follow the flow of the cells. Unfortunately this requires reading and parsing through the whole DVD and takes up to 30 seconds or more. I tried to calculate the length by using the sector information which seemed to be very fast, but the results were simply wrong. Is there a way that would allow to quickly determien the size of the MPEG stream for a particular title/chapter/angle selection? In case anyone is interested to see my attempts :) http://mediatomb.svn.sourceforge.net/viewvc/mediatomb/trunk/mediatomb/src/dvd_read.cc?revision=1877&view=markup Kind regards, Jin Sergey 'Jin' Bostandzhyan 2008-09-15T14:44:56 http://comments.gmane.org/gmane.comp.video.dvdnav.general/662 Author: diego Date: Sun Sep 14 23:47:08 2008 New Revision: 1148 Log: Ignore all generated files. Modified: trunk/libdvdread/misc/ (props changed) diego 2008-09-14T21:47:08 http://comments.gmane.org/gmane.comp.video.dvdnav.general/660 Author: diego Date: Sun Sep 14 23:10:59 2008 New Revision: 1147 Log: Remove executable property from non-executable files. Modified: trunk/libdvdnav/msvc/config.h (props changed) trunk/libdvdnav/msvc/contrib/bcopy.c (props changed) trunk/libdvdnav/msvc/contrib/dirent/dirent.c (props changed) trunk/libdvdnav/msvc/contrib/dirent/dirent.h (props changed) trunk/libdvdnav/msvc/contrib/dlfcn.c (props changed) trunk/libdvdnav/msvc/contrib/getopt.c (props changed) trunk/libdvdnav/msvc/contrib/timer/timer.c (props changed) trunk/libdvdnav/msvc/contrib/timer/timer.h (props changed) trunk/libdvdnav/msvc/ifo_dump.dsp (props changed) trunk/libdvdnav/msvc/include/dlfcn.h (props changed) trunk/libdvdnav/msvc/include/getopt.h (props changed) trunk/libdvdnav/msvc/include/inttypes.h (props changed) trunk/libdvdnav/msvc/include/os_types.h (props changed) trunk/libdvdnav/msvc/include/pthreads/pthread.h (props changed) trunk/libdvdnav/msvc/include/pthreads/sched.h (props changed) trunk/libdvdnav/msvc/include/sys/time.h (props changed) trunk/libdvdnav/msvc/include/timer.h (props changed) trunk/libdvdnav/msvc/include/unistd.h (props changed) trunk/libdvdnav/msvc/install/README (props changed) trunk/libdvdnav/msvc/libdvdcss.def (props changed) trunk/libdvdnav/msvc/libdvdcss.dsp (props changed) trunk/libdvdnav/msvc/libdvdnav.def (props changed) trunk/libdvdnav/msvc/libdvdnav.dsp (props changed) trunk/libdvdnav/msvc/libdvdnav.dsw (props changed) trunk/libdvdnav/msvc/libwin32utils.def (props changed) trunk/libdvdnav/msvc/libwin32utils.dsp (props changed) trunk/libdvdnav/msvc/play_title.dsp (props changed) trunk/libdvdnav/msvc/title_info.dsp (props changed) diego 2008-09-14T21:10:59 http://comments.gmane.org/gmane.comp.video.dvdnav.general/659 Author: diego Date: Sun Sep 14 23:02:38 2008 New Revision: 1146 Log: Remove executable property from non-executable files. Modified: trunk/libdvdread/msvc/config.h (props changed) trunk/libdvdread/msvc/contrib/bcopy.c (props changed) trunk/libdvdread/msvc/contrib/dirent/dirent.c (props changed) trunk/libdvdread/msvc/contrib/dirent/dirent.h (props changed) trunk/libdvdread/msvc/contrib/dlfcn.c (props changed) trunk/libdvdread/msvc/contrib/getopt.c (props changed) trunk/libdvdread/msvc/contrib/timer/timer.c (props changed) trunk/libdvdread/msvc/contrib/timer/timer.h (props changed) trunk/libdvdread/msvc/ifo_dump.dsp (props changed) trunk/libdvdread/msvc/include/dlfcn.h (props changed) trunk/libdvdread/msvc/include/getopt.h (props changed) trunk/libdvdread/msvc/include/inttypes.h (props changed) trunk/libdvdread/msvc/include/os_types.h (props changed) trunk/libdvdread/msvc/include/pthreads/pthread.h (props changed) trunk/libdvdread/msvc/include/pthreads/sched.h (props changed) trunk/libdvdread/msvc/include/sys/time.h (props changed) trunk/libdvdread/msvc/include/timer.h (props changed) trunk/libdvdread/msvc/include/unistd.h (props changed) trunk/libdvdread/msvc/install/README (props changed) trunk/libdvdread/msvc/libdvdcss.def (props changed) trunk/libdvdread/msvc/libdvdcss.dsp (props changed) trunk/libdvdread/msvc/libdvdnav.def (props changed) trunk/libdvdread/msvc/libdvdnav.dsp (props changed) trunk/libdvdread/msvc/libdvdnav.dsw (props changed) trunk/libdvdread/msvc/libwin32utils.def (props changed) trunk/libdvdread/msvc/libwin32utils.dsp (props changed) trunk/libdvdread/msvc/play_title.dsp (props changed) trunk/libdvdread/msvc/title_info.dsp (props changed) diego 2008-09-14T21:02:38 http://comments.gmane.org/gmane.comp.video.dvdnav.general/658 Author: diego Date: Sun Sep 14 22:53:47 2008 New Revision: 1145 Log: Add missing license header. Modified: trunk/libdvdread/src/dvdread_internal.h Modified: trunk/libdvdread/src/dvdread_internal.h ============================================================================== --- trunk/libdvdread/src/dvdread_internal.h(original) +++ trunk/libdvdread/src/dvdread_internal.hSun Sep 14 22:53:47 2008 < at >< at > -1,3 +1,21 < at >< at > +/* + * This file is part of libdvdread. + * + * libdvdread 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. + * + * libdvdread 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 libdvdread; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + #ifndef LIBDVDREAD_DVDREAD_INTERNAL_H #define LIBDVDREAD_DVDREAD_INTERNAL_H diego 2008-09-14T20:53:47 http://comments.gmane.org/gmane.comp.video.dvdnav.general/657 Author: diego Date: Sun Sep 14 22:43:32 2008 New Revision: 1144 Log: Remove useless $Id$, $Log$ and $Name$ keywords. Modified: trunk/libdvdread/autogen.sh trunk/libdvdread/msvc/contrib/dlfcn.c trunk/libdvdread/msvc/include/dlfcn.h trunk/libdvdread/msvc/include/dvdnav_internal.h trunk/libdvdread/msvc/include/os_types.h trunk/libdvdread/src/ifo_print.c trunk/libdvdread/src/ifo_print.h Modified: trunk/libdvdread/autogen.sh ============================================================================== --- trunk/libdvdread/autogen.sh(original) +++ trunk/libdvdread/autogen.shSun Sep 14 22:43:32 2008 < at >< at > -1,7 +1,5 < at >< at > #!/bin/sh # -# $Id$ -# # run this to generate all the initial makefiles, etc. srcdir=`dirname "$0"` Modified: trunk/libdvdread/msvc/contrib/dlfcn.c ============================================================================== --- trunk/libdvdread/msvc/contrib/dlfcn.c(original) +++ trunk/libdvdread/msvc/contrib/dlfcn.cSun Sep 14 22:43:32 2008 < at >< at > -1,7 +1,4 < at >< at > /* - * $Id$ - * $Name$ - * * Adopted from Apache DSO code. * Portions copyright Apache Software Foundation * Modified: trunk/libdvdread/msvc/include/dlfcn.h ============================================================================== --- trunk/libdvdread/msvc/include/dlfcn.h(original) +++ trunk/libdvdread/msvc/include/dlfcn.hSun Sep 14 22:43:32 2008 < at >< at > -1,11 +1,6 < at >< at > #ifndef __DLFCN_H__ # define __DLFCN_H__ -/* - * $Id$ - * $Name$ - * - * - */ + extern void *dlopen (const char *file, int mode); extern int dlclose (void *handle); extern void *dlsym (void * handle, const char * name); Modified: trunk/libdvdread/msvc/include/dvdnav_internal.h ============================================================================== --- trunk/libdvdread/msvc/include/dvdnav_internal.h(original) +++ trunk/libdvdread/msvc/include/dvdnav_internal.hSun Sep 14 22:43:32 2008 < at >< at > -17,9 +17,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifndef LIBDVDREAD_DVDNAV_INTERNAL_H Modified: trunk/libdvdread/msvc/include/os_types.h ============================================================================== --- trunk/libdvdread/msvc/include/os_types.h(original) +++ trunk/libdvdread/msvc/include/os_types.hSun Sep 14 22:43:32 2008 < at >< at > -1,9 +1,6 < at >< at > #ifndef __OS_TYPES_H__ #define __OS_TYPES_H__ /* - * $Id$ - * $Name$ - * * win32 types * 04 Sept 2001 - Chris Wolf create. */ Modified: trunk/libdvdread/src/ifo_print.c ============================================================================== --- trunk/libdvdread/src/ifo_print.c(original) +++ trunk/libdvdread/src/ifo_print.cSun Sep 14 22:43:32 2008 < at >< at > -14,9 +14,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdread; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #include <stdio.h> < at >< at > -1206,48 +1203,3 < at >< at > void ifo_print(dvd_reader_t *dvd, int ti ifoClose(ifohandle); } - -/* - * $Log$ - * Revision 1.3 2004/10/22 11:36:19 jcdutton - * Stop seg fault when using ifo_dump. - * - * Revision 1.2 2004/09/27 12:24:01 jcdutton - * Add extra info to printout when using ifo_dump. - * - * Revision 1.1 2004/01/11 21:43:13 mroi - * big build system changes - * * cleaned up all Makefiles and added a Makefile.common - * * added relchk script - * * moved libdvdread files to a dvdread subdir - * * moved DVD VM to a vm subdir - * * removed unused code in read_cache.c - * - * Revision 1.4 2004/01/01 15:13:13 jcdutton - * Put ifo_print.c and .h back in. - * - * Revision 1.7 2003/04/28 15:17:17 jcdutton - * Update ifodump to work with new libdvdnav cvs, instead of needing libdvdread. - * - * Revision 1.6 2003/04/05 22:49:04 jcdutton - * Update with more info from the latest libdvdread. - * - * Revision 1.5 2003/04/05 13:03:49 jcdutton - * Small updates. - * - * Revision 1.4 2003/04/01 08:01:03 jcdutton - * Add VTS Time map display. Requires libdvdread 0.9.4. The same version that comes with xine. - * - * Revision 1.3 2003/03/14 15:49:18 mroi - * adjust to new libdvdread version - * - * Revision 1.2 2002/08/30 05:12:33 jcdutton - * Minor update now that I know what PGC Entry IDs are for. - * - * Revision 1.1.1.1 2002/08/28 09:48:35 jcdutton - * Initial import into CVS. - * - * - * - */ - Modified: trunk/libdvdread/src/ifo_print.h ============================================================================== --- trunk/libdvdread/src/ifo_print.h(original) +++ trunk/libdvdread/src/ifo_print.hSun Sep 14 22:43:32 2008 < at >< at > -14,9 +14,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdread; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifndef LIBDVDREAD_IFO_PRINT_H < at >< at > -29,27 +26,3 < at >< at > void ifo_print(dvd_reader_t *dvd, int ti void dvdread_print_time(dvd_time_t *dtime); #endif /* LIBDVDREAD_IFO_PRINT_H */ - -/* - * $Log$ - * Revision 1.1 2004/01/11 21:43:13 mroi - * big build system changes - * * cleaned up all Makefiles and added a Makefile.common - * * added relchk script - * * moved libdvdread files to a dvdread subdir - * * moved DVD VM to a vm subdir - * * removed unused code in read_cache.c - * - * Revision 1.4 2004/01/01 15:13:13 jcdutton - * Put ifo_print.c and .h back in. - * - * Revision 1.2 2003/04/28 15:17:17 jcdutton - * Update ifodump to work with new libdvdnav cvs, instead of needing libdvdread. - * - * Revision 1.1.1.1 2002/08/28 09:48:35 jcdutton - * Initial import into CVS. - * - * - * - */ - diego 2008-09-14T20:43:33 http://comments.gmane.org/gmane.comp.video.dvdnav.general/656 Author: diego Date: Sun Sep 14 22:37:38 2008 New Revision: 1143 Log: Use consistent multiple inclusion guards everywhere: Combine them from a LIBDVDREAD_ prefix and the filename. Modified: trunk/libdvdread/msvc/config.h trunk/libdvdread/msvc/include/dvdnav_internal.h trunk/libdvdread/src/bitreader.h trunk/libdvdread/src/bswap.h trunk/libdvdread/src/dvd_input.h trunk/libdvdread/src/dvd_reader.h trunk/libdvdread/src/dvd_udf.h trunk/libdvdread/src/dvdread_internal.h trunk/libdvdread/src/ifo_print.h trunk/libdvdread/src/ifo_read.h trunk/libdvdread/src/ifo_types.h trunk/libdvdread/src/md5.h trunk/libdvdread/src/nav_print.h trunk/libdvdread/src/nav_read.h trunk/libdvdread/src/nav_types.h Modified: trunk/libdvdread/msvc/config.h ============================================================================== --- trunk/libdvdread/msvc/config.h(original) +++ trunk/libdvdread/msvc/config.hSun Sep 14 22:37:38 2008 < at >< at > -1,5 +1,8 < at >< at > /* config.h. Generated by hand. */ +#ifndef LIBDVDREAD_CONFIG_H +#define LIBDVDREAD_CONFIG_H + #define HAVE_DLFCN_H 1 /* #undef HAVE_DVDCSS_DVDCSS_H*/ /* #undef HAVE_INTTYPES_H */ < at >< at > -49,3 +52,5 < at >< at > typedef signed int int32_t; typedef unsigned __int64 uint64_t; typedef signed __int64 int64_t; typedef unsigned int uintptr_t; + +#endif /* LIBDVDREAD_CONFIG_H */ Modified: trunk/libdvdread/msvc/include/dvdnav_internal.h ============================================================================== --- trunk/libdvdread/msvc/include/dvdnav_internal.h(original) +++ trunk/libdvdread/msvc/include/dvdnav_internal.hSun Sep 14 22:37:38 2008 < at >< at > -22,8 +22,8 < at >< at > * */ -#ifndef DVDNAV_INTERNAL_H_INCLUDED -#define DVDNAV_INTERNAL_H_INCLUDED +#ifndef LIBDVDREAD_DVDNAV_INTERNAL_H +#define LIBDVDREAD_DVDNAV_INTERNAL_H #ifdef HAVE_CONFIG_H #include "config.h" < at >< at > -182,4 +182,4 < at >< at > struct dvdnav_s { #define S_OK DVDNAV_STATUS_OK #endif /* MSC_VER */ -#endif /* DVDNAV_INTERNAL_H_INCLUDED */ +#endif /* LIBDVDREAD_DVDNAV_INTERNAL_H */ Modified: trunk/libdvdread/src/bitreader.h ============================================================================== --- trunk/libdvdread/src/bitreader.h(original) +++ trunk/libdvdread/src/bitreader.hSun Sep 14 22:37:38 2008 < at >< at > -1,6 +1,3 < at >< at > -#ifndef BITREADER_H_INCLUDED -#define BITREADER_H_INCLUDED - /* * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort< at >dtek.chalmers.se>. * < at >< at > -21,6 +18,8 < at >< at > * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_BITREADER_H +#define LIBDVDREAD_BITREADER_H #ifdef __cplusplus extern "C" { < at >< at > -39,4 +38,4 < at >< at > uint32_t dvdread_getbits(getbits_state_t #ifdef __cplusplus }; #endif -#endif /* BITREADER_H_INCLUDED */ +#endif /* LIBDVDREAD_BITREADER_H */ Modified: trunk/libdvdread/src/bswap.h ============================================================================== --- trunk/libdvdread/src/bswap.h(original) +++ trunk/libdvdread/src/bswap.hSun Sep 14 22:37:38 2008 < at >< at > -1,6 +1,3 < at >< at > -#ifndef BSWAP_H_INCLUDED -#define BSWAP_H_INCLUDED - /* * Copyright (C) 2000, 2001 Billy Biggs <vektor< at >dumbterm.net>, * Håkan Hjort <d95hjort< at >dtek.chalmers.se> < at >< at > -22,6 +19,9 < at >< at > * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_BSWAP_H +#define LIBDVDREAD_BSWAP_H + #include <config.h> #if defined(WORDS_BIGENDIAN) < at >< at > -103,4 +103,4 < at >< at > #endif /* WORDS_BIGENDIAN */ -#endif /* BSWAP_H_INCLUDED */ +#endif /* LIBDVDREAD_BSWAP_H */ Modified: trunk/libdvdread/src/dvd_input.h ============================================================================== --- trunk/libdvdread/src/dvd_input.h(original) +++ trunk/libdvdread/src/dvd_input.hSun Sep 14 22:37:38 2008 < at >< at > -1,6 +1,3 < at >< at > -#ifndef DVD_INPUT_H_INCLUDED -#define DVD_INPUT_H_INCLUDED - /* * Copyright (C) 2001, 2002 Samuel Hocevar <sam< at >zoy.org>, * Håkan Hjort <d95hjort< at >dtek.chalmers.se> < at >< at > -22,6 +19,9 < at >< at > * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_DVD_INPUT_H +#define LIBDVDREAD_DVD_INPUT_H + /** * Defines and flags. Make sure they fit the libdvdcss API! */ < at >< at > -47,4 +47,4 < at >< at > extern char * (*dvdinput_error) (dv */ int dvdinput_setup(void); -#endif /* DVD_INPUT_H_INCLUDED */ +#endif /* LIBDVDREAD_DVD_INPUT_H */ Modified: trunk/libdvdread/src/dvd_reader.h ============================================================================== --- trunk/libdvdread/src/dvd_reader.h(original) +++ trunk/libdvdread/src/dvd_reader.hSun Sep 14 22:37:38 2008 < at >< at > -1,6 +1,3 < at >< at > -#ifndef DVD_READER_H_INCLUDED -#define DVD_READER_H_INCLUDED - /* * Copyright (C) 2001, 2002 Billy Biggs <vektor< at >dumbterm.net>, * Håkan Hjort <d95hjort< at >dtek.chalmers.se>, < at >< at > -23,6 +20,9 < at >< at > * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_DVD_READER_H +#define LIBDVDREAD_DVD_READER_H + #ifdef _MSC_VER #include <config.h> < at >< at > -274,4 +274,4 < at >< at > int DVDUDFCacheLevel( dvd_reader_t *, in #ifdef __cplusplus }; #endif -#endif /* DVD_READER_H_INCLUDED */ +#endif /* LIBDVDREAD_DVD_READER_H */ Modified: trunk/libdvdread/src/dvd_udf.h ============================================================================== --- trunk/libdvdread/src/dvd_udf.h(original) +++ trunk/libdvdread/src/dvd_udf.hSun Sep 14 22:37:38 2008 < at >< at > -1,6 +1,3 < at >< at > -#ifndef DVD_UDF_H_INCLUDED -#define DVD_UDF_H_INCLUDED - /* * This code is based on dvdudf by: * Christian Wolff <scarabaeus< at >convergence.de>. < at >< at > -31,6 +28,9 < at >< at > * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_DVD_UDF_H +#define LIBDVDREAD_DVD_UDF_H + #include <inttypes.h> #include "dvd_reader.h" < at >< at > -59,4 +59,4 < at >< at > void SetUDFCacheHandle(dvd_reader_t *dev #ifdef __cplusplus }; #endif -#endif /* DVD_UDF_H_INCLUDED */ +#endif /* LIBDVDREAD_DVD_UDF_H */ Modified: trunk/libdvdread/src/dvdread_internal.h ============================================================================== --- trunk/libdvdread/src/dvdread_internal.h(original) +++ trunk/libdvdread/src/dvdread_internal.hSun Sep 14 22:37:38 2008 < at >< at > -1,5 +1,5 < at >< at > -#ifndef DVDREAD_INTERNAL_H -#define DVDREAD_INTERNAL_H +#ifndef LIBDVDREAD_DVDREAD_INTERNAL_H +#define LIBDVDREAD_DVDREAD_INTERNAL_H #ifdef _MSC_VER #include <unistd.h> < at >< at > -12,4 +12,4 < at >< at > __FILE__, __LINE__, # arg ); \ } -#endif /* DVDREAD_INTERNAL_H */ +#endif /* LIBDVDREAD_DVDREAD_INTERNAL_H */ Modified: trunk/libdvdread/src/ifo_print.h ============================================================================== --- trunk/libdvdread/src/ifo_print.h(original) +++ trunk/libdvdread/src/ifo_print.hSun Sep 14 22:37:38 2008 < at >< at > -19,8 +19,8 < at >< at > * */ -#ifndef IFO_PRINT_H_INCLUDED -#define IFO_PRINT_H_INCLUDED +#ifndef LIBDVDREAD_IFO_PRINT_H +#define LIBDVDREAD_IFO_PRINT_H #include <inttypes.h> #include "ifo_types.h" < at >< at > -28,7 +28,7 < at >< at > void ifo_print(dvd_reader_t *dvd, int title); void dvdread_print_time(dvd_time_t *dtime); -#endif /* IFO_PRINT_H_INCLUDED */ +#endif /* LIBDVDREAD_IFO_PRINT_H */ /* * $Log$ Modified: trunk/libdvdread/src/ifo_read.h ============================================================================== --- trunk/libdvdread/src/ifo_read.h(original) +++ trunk/libdvdread/src/ifo_read.hSun Sep 14 22:37:38 2008 < at >< at > -1,6 +1,3 < at >< at > -#ifndef IFO_READ_H_INCLUDED -#define IFO_READ_H_INCLUDED - /* * Copyright (C) 2000, 2001, 2002 Björn Englund <d4bjorn< at >dtek.chalmers.se>, * Håkan Hjort <d95hjort< at >dtek.chalmers.se> < at >< at > -22,6 +19,9 < at >< at > * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_IFO_READ_H +#define LIBDVDREAD_IFO_READ_H + #include "ifo_types.h" #include "dvd_reader.h" < at >< at > -226,4 +226,4 < at >< at > void ifoFree_TXTDT_MGI(ifo_handle_t *); #ifdef __cplusplus }; #endif -#endif /* IFO_READ_H_INCLUDED */ +#endif /* LIBDVDREAD_IFO_READ_H */ Modified: trunk/libdvdread/src/ifo_types.h ============================================================================== --- trunk/libdvdread/src/ifo_types.h(original) +++ trunk/libdvdread/src/ifo_types.hSun Sep 14 22:37:38 2008 < at >< at > -1,6 +1,3 < at >< at > -#ifndef IFO_TYPES_H_INCLUDED -#define IFO_TYPES_H_INCLUDED - /* * Copyright (C) 2000, 2001 Björn Englund <d4bjorn< at >dtek.chalmers.se>, * Håkan Hjort <d95hjort< at >dtek.chalmers.se> < at >< at > -22,6 +19,9 < at >< at > * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_IFO_TYPES_H +#define LIBDVDREAD_IFO_TYPES_H + #include <inttypes.h> #include "dvd_reader.h" < at >< at > -746,4 +746,4 < at >< at > typedef struct { vobu_admap_t *vts_vobu_admap; } ifo_handle_t; -#endif /* IFO_TYPES_H_INCLUDED */ +#endif /* LIBDVDREAD_IFO_TYPES_H */ Modified: trunk/libdvdread/src/md5.h ============================================================================== --- trunk/libdvdread/src/md5.h(original) +++ trunk/libdvdread/src/md5.hSun Sep 14 22:37:38 2008 < at >< at > -18,8 +18,8 < at >< at > along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _MD5_H -#define _MD5_H 1 +#ifndef LIBDVDREAD_MD5_H +#define LIBDVDREAD_MD5_H #include <stdio.h> < at >< at > -158,4 +158,4 < at >< at > rol(md5_uint32 x, int n) # define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) ) #endif -#endif +#endif /* LIBDVDREAD_MD5_H */ Modified: trunk/libdvdread/src/nav_print.h ============================================================================== --- trunk/libdvdread/src/nav_print.h(original) +++ trunk/libdvdread/src/nav_print.hSun Sep 14 22:37:38 2008 < at >< at > -1,6 +1,3 < at >< at > -#ifndef NAV_PRINT_H_INCLUDED -#define NAV_PRINT_H_INCLUDED - /* * Copyright (C) 2001, 2002 Billy Biggs <vektor< at >dumbterm.net>, * Håkan Hjort <d95hjort< at >dtek.chalmers.se> < at >< at > -22,6 +19,9 < at >< at > * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_NAV_PRINT_H +#define LIBDVDREAD_NAV_PRINT_H + #include "nav_types.h" /** < at >< at > -49,4 +49,4 < at >< at > void navPrint_DSI(dsi_t *); #ifdef __cplusplus }; #endif -#endif /* NAV_PRINT_H_INCLUDED */ +#endif /* LIBDVDREAD_NAV_PRINT_H */ Modified: trunk/libdvdread/src/nav_read.h ============================================================================== --- trunk/libdvdread/src/nav_read.h(original) +++ trunk/libdvdread/src/nav_read.hSun Sep 14 22:37:38 2008 < at >< at > -1,6 +1,3 < at >< at > -#ifndef NAV_READ_H_INCLUDED -#define NAV_READ_H_INCLUDED - /* * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort< at >dtek.chalmers.se>. * < at >< at > -21,6 +18,9 < at >< at > * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_NAV_READ_H +#define LIBDVDREAD_NAV_READ_H + #include "nav_types.h" /** < at >< at > -50,4 +50,4 < at >< at > void navRead_DSI(dsi_t *, unsigned char #ifdef __cplusplus }; #endif -#endif /* NAV_READ_H_INCLUDED */ +#endif /* LIBDVDREAD_NAV_READ_H */ Modified: trunk/libdvdread/src/nav_types.h ============================================================================== --- trunk/libdvdread/src/nav_types.h(original) +++ trunk/libdvdread/src/nav_types.hSun Sep 14 22:37:38 2008 < at >< at > -1,6 +1,3 < at >< at > -#ifndef NAV_TYPES_H_INCLUDED -#define NAV_TYPES_H_INCLUDED - /* * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort< at >dtek.chalmers.se> * < at >< at > -28,6 +25,9 < at >< at > * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef LIBDVDREAD_NAV_TYPES_H +#define LIBDVDREAD_NAV_TYPES_H + #include <inttypes.h> #include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */ < at >< at > -245,4 +245,4 < at >< at > typedef struct { #pragma pack() #endif -#endif /* NAV_TYPES_H_INCLUDED */ +#endif /* LIBDVDREAD_NAV_TYPES_H */ _______________________________________________ DVDnav-discuss mailing list DVDnav-discuss< at >mplayerhq.hu https://lists.mplayerhq.hu/mailman/listinfo/dvdnav-discuss diego 2008-09-14T20:37:38 http://comments.gmane.org/gmane.comp.video.dvdnav.general/655 Author: diego Date: Sun Sep 14 22:31:43 2008 New Revision: 1142 Log: Remove useless $Id$ and $Name$ keywords. Modified: trunk/libdvdnav/autogen.sh trunk/libdvdnav/examples/menus.c trunk/libdvdnav/msvc/contrib/dlfcn.c trunk/libdvdnav/msvc/include/dlfcn.h trunk/libdvdnav/msvc/include/dvdnav_internal.h trunk/libdvdnav/msvc/include/os_types.h trunk/libdvdnav/src/dvd_types.h trunk/libdvdnav/src/dvdnav.c trunk/libdvdnav/src/dvdnav.h trunk/libdvdnav/src/dvdnav_events.h trunk/libdvdnav/src/dvdnav_internal.h trunk/libdvdnav/src/highlight.c trunk/libdvdnav/src/navigation.c trunk/libdvdnav/src/read_cache.c trunk/libdvdnav/src/read_cache.h trunk/libdvdnav/src/remap.c trunk/libdvdnav/src/remap.h trunk/libdvdnav/src/searching.c trunk/libdvdnav/src/settings.c trunk/libdvdnav/src/vm/decoder.c trunk/libdvdnav/src/vm/decoder.h trunk/libdvdnav/src/vm/vm.c trunk/libdvdnav/src/vm/vm.h trunk/libdvdnav/src/vm/vmcmd.c trunk/libdvdnav/src/vm/vmcmd.h Modified: trunk/libdvdnav/autogen.sh ============================================================================== --- trunk/libdvdnav/autogen.sh(original) +++ trunk/libdvdnav/autogen.shSun Sep 14 22:31:43 2008 < at >< at > -1,7 +1,5 < at >< at > #!/bin/sh # -# $Id$ -# # run this to generate all the initial makefiles, etc. srcdir=`dirname "$0"` Modified: trunk/libdvdnav/examples/menus.c ============================================================================== --- trunk/libdvdnav/examples/menus.c(original) +++ trunk/libdvdnav/examples/menus.cSun Sep 14 22:31:43 2008 < at >< at > -16,9 +16,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #include <stdio.h> Modified: trunk/libdvdnav/msvc/contrib/dlfcn.c ============================================================================== --- trunk/libdvdnav/msvc/contrib/dlfcn.c(original) +++ trunk/libdvdnav/msvc/contrib/dlfcn.cSun Sep 14 22:31:43 2008 < at >< at > -1,7 +1,4 < at >< at > /* - * $Id$ - * $Name$ - * * Adopted from Apache DSO code. * Portions copyright Apache Software Foundation * Modified: trunk/libdvdnav/msvc/include/dlfcn.h ============================================================================== --- trunk/libdvdnav/msvc/include/dlfcn.h(original) +++ trunk/libdvdnav/msvc/include/dlfcn.hSun Sep 14 22:31:43 2008 < at >< at > -1,11 +1,6 < at >< at > #ifndef __DLFCN_H__ # define __DLFCN_H__ -/* - * $Id$ - * $Name$ - * - * - */ + extern void *dlopen (const char *file, int mode); extern int dlclose (void *handle); extern void *dlsym (void * handle, const char * name); Modified: trunk/libdvdnav/msvc/include/dvdnav_internal.h ============================================================================== --- trunk/libdvdnav/msvc/include/dvdnav_internal.h(original) +++ trunk/libdvdnav/msvc/include/dvdnav_internal.hSun Sep 14 22:31:43 2008 < at >< at > -17,9 +17,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifndef LIBDVDNAV_DVDNAV_INTERNAL_H Modified: trunk/libdvdnav/msvc/include/os_types.h ============================================================================== --- trunk/libdvdnav/msvc/include/os_types.h(original) +++ trunk/libdvdnav/msvc/include/os_types.hSun Sep 14 22:31:43 2008 < at >< at > -1,9 +1,6 < at >< at > #ifndef __OS_TYPES_H__ #define __OS_TYPES_H__ /* - * $Id$ - * $Name$ - * * win32 types * 04 Sept 2001 - Chris Wolf create. */ Modified: trunk/libdvdnav/src/dvd_types.h ============================================================================== --- trunk/libdvdnav/src/dvd_types.h(original) +++ trunk/libdvdnav/src/dvd_types.hSun Sep 14 22:31:43 2008 < at >< at > -17,9 +17,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ /* Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c(original) +++ trunk/libdvdnav/src/dvdnav.cSun Sep 14 22:31:43 2008 < at >< at > -16,9 +16,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifdef HAVE_CONFIG_H Modified: trunk/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h(original) +++ trunk/libdvdnav/src/dvdnav.hSun Sep 14 22:31:43 2008 < at >< at > -16,9 +16,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ /* Modified: trunk/libdvdnav/src/dvdnav_events.h ============================================================================== --- trunk/libdvdnav/src/dvdnav_events.h(original) +++ trunk/libdvdnav/src/dvdnav_events.hSun Sep 14 22:31:43 2008 < at >< at > -16,9 +16,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ /* Modified: trunk/libdvdnav/src/dvdnav_internal.h ============================================================================== --- trunk/libdvdnav/src/dvdnav_internal.h(original) +++ trunk/libdvdnav/src/dvdnav_internal.hSun Sep 14 22:31:43 2008 < at >< at > -16,9 +16,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifndef LIBDVDNAV_DVDNAV_INTERNAL_H Modified: trunk/libdvdnav/src/highlight.c ============================================================================== --- trunk/libdvdnav/src/highlight.c(original) +++ trunk/libdvdnav/src/highlight.cSun Sep 14 22:31:43 2008 < at >< at > -16,9 +16,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifdef HAVE_CONFIG_H Modified: trunk/libdvdnav/src/navigation.c ============================================================================== --- trunk/libdvdnav/src/navigation.c(original) +++ trunk/libdvdnav/src/navigation.cSun Sep 14 22:31:43 2008 < at >< at > -16,9 +16,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifdef HAVE_CONFIG_H Modified: trunk/libdvdnav/src/read_cache.c ============================================================================== --- trunk/libdvdnav/src/read_cache.c(original) +++ trunk/libdvdnav/src/read_cache.cSun Sep 14 22:31:43 2008 < at >< at > -17,9 +17,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ /* * There was a multithreaded read ahead cache in here for some time, but Modified: trunk/libdvdnav/src/read_cache.h ============================================================================== --- trunk/libdvdnav/src/read_cache.h(original) +++ trunk/libdvdnav/src/read_cache.hSun Sep 14 22:31:43 2008 < at >< at > -16,9 +16,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifndef LIBDVDNAV_READ_CACHE_H Modified: trunk/libdvdnav/src/remap.c ============================================================================== --- trunk/libdvdnav/src/remap.c(original) +++ trunk/libdvdnav/src/remap.cSun Sep 14 22:31:43 2008 < at >< at > -14,8 +14,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ */ #ifdef HAVE_CONFIG_H Modified: trunk/libdvdnav/src/remap.h ============================================================================== --- trunk/libdvdnav/src/remap.h(original) +++ trunk/libdvdnav/src/remap.hSun Sep 14 22:31:43 2008 < at >< at > -14,8 +14,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ */ #ifndef LIBDVDNAV_REMAP_H Modified: trunk/libdvdnav/src/searching.c ============================================================================== --- trunk/libdvdnav/src/searching.c(original) +++ trunk/libdvdnav/src/searching.cSun Sep 14 22:31:43 2008 < at >< at > -16,9 +16,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifdef HAVE_CONFIG_H Modified: trunk/libdvdnav/src/settings.c ============================================================================== --- trunk/libdvdnav/src/settings.c(original) +++ trunk/libdvdnav/src/settings.cSun Sep 14 22:31:43 2008 < at >< at > -16,9 +16,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifdef HAVE_CONFIG_H Modified: trunk/libdvdnav/src/vm/decoder.c ============================================================================== --- trunk/libdvdnav/src/vm/decoder.c(original) +++ trunk/libdvdnav/src/vm/decoder.cSun Sep 14 22:31:43 2008 < at >< at > -18,9 +18,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifdef HAVE_CONFIG_H Modified: trunk/libdvdnav/src/vm/decoder.h ============================================================================== --- trunk/libdvdnav/src/vm/decoder.h(original) +++ trunk/libdvdnav/src/vm/decoder.hSun Sep 14 22:31:43 2008 < at >< at > -17,9 +17,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifndef LIBDVDNAV_DECODER_H Modified: trunk/libdvdnav/src/vm/vm.c ============================================================================== --- trunk/libdvdnav/src/vm/vm.c(original) +++ trunk/libdvdnav/src/vm/vm.cSun Sep 14 22:31:43 2008 < at >< at > -19,9 +19,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifdef HAVE_CONFIG_H Modified: trunk/libdvdnav/src/vm/vm.h ============================================================================== --- trunk/libdvdnav/src/vm/vm.h(original) +++ trunk/libdvdnav/src/vm/vm.hSun Sep 14 22:31:43 2008 < at >< at > -18,9 +18,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifndef LIBDVDNAV_VM_H Modified: trunk/libdvdnav/src/vm/vmcmd.c ============================================================================== --- trunk/libdvdnav/src/vm/vmcmd.c(original) +++ trunk/libdvdnav/src/vm/vmcmd.cSun Sep 14 22:31:43 2008 < at >< at > -18,9 +18,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifdef HAVE_CONFIG_H Modified: trunk/libdvdnav/src/vm/vmcmd.h ============================================================================== --- trunk/libdvdnav/src/vm/vmcmd.h(original) +++ trunk/libdvdnav/src/vm/vmcmd.hSun Sep 14 22:31:43 2008 < at >< at > -17,9 +17,6 < at >< at > * You should have received a copy of the GNU General Public License along * with libdvdnav; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * $Id$ - * */ #ifndef LIBDVDNAV_VMCMD_H diego 2008-09-14T20:31:43 http://comments.gmane.org/gmane.comp.video.dvdnav.general/653 Author: diego Date: Sun Sep 14 22:11:17 2008 New Revision: 1141 Log: Use consistent multiple inclusion guards everywhere: Combine them from a LIBDVDNAV_ prefix and the filename. Modified: trunk/libdvdnav/msvc/config.h trunk/libdvdnav/msvc/include/dvdnav_internal.h trunk/libdvdnav/src/dvd_types.h trunk/libdvdnav/src/dvdnav.h trunk/libdvdnav/src/dvdnav_events.h trunk/libdvdnav/src/dvdnav_internal.h trunk/libdvdnav/src/read_cache.h trunk/libdvdnav/src/remap.h trunk/libdvdnav/src/vm/decoder.h trunk/libdvdnav/src/vm/vm.h trunk/libdvdnav/src/vm/vmcmd.h Modified: trunk/libdvdnav/msvc/config.h ============================================================================== --- trunk/libdvdnav/msvc/config.h(original) +++ trunk/libdvdnav/msvc/config.hSun Sep 14 22:11:17 2008 < at >< at > -1,5 +1,8 < at >< at > /* config.h. Generated by hand. */ +#ifndef LIBDVNAV_CONFIG_H +#define LIBDVNAV_CONFIG_H + #define HAVE_DLFCN_H 1 /* #undef HAVE_DVDCSS_DVDCSS_H*/ /* #undef HAVE_INTTYPES_H */ < at >< at > -49,3 +52,5 < at >< at > typedef signed int int32_t; typedef unsigned __int64 uint64_t; typedef signed __int64 int64_t; typedef unsigned int uintptr_t; + +#endif /* LIBDVNAV_CONFIG_H */ Modified: trunk/libdvdnav/msvc/include/dvdnav_internal.h ============================================================================== --- trunk/libdvdnav/msvc/include/dvdnav_internal.h(original) +++ trunk/libdvdnav/msvc/include/dvdnav_internal.hSun Sep 14 22:11:17 2008 < at >< at > -22,8 +22,8 < at >< at > * */ -#ifndef DVDNAV_INTERNAL_H_INCLUDED -#define DVDNAV_INTERNAL_H_INCLUDED +#ifndef LIBDVDNAV_DVDNAV_INTERNAL_H +#define LIBDVDNAV_DVDNAV_INTERNAL_H #ifdef HAVE_CONFIG_H #include "config.h" < at >< at > -182,4 +182,4 < at >< at > struct dvdnav_s { #define S_OK DVDNAV_STATUS_OK #endif /* MSC_VER */ -#endif /* DVDNAV_INTERNAL_H_INCLUDED */ +#endif /* LIBDVDNAV_DVDNAV_INTERNAL_H */ Modified: trunk/libdvdnav/src/dvd_types.h ============================================================================== --- trunk/libdvdnav/src/dvd_types.h(original) +++ trunk/libdvdnav/src/dvd_types.hSun Sep 14 22:11:17 2008 < at >< at > -26,8 +26,8 < at >< at > * Various useful structs and enums for DVDs. */ -#ifndef DVD_H_INCLUDED -#define DVD_H_INCLUDED +#ifndef LIBDVDNAV_DVD_TYPES_H +#define LIBDVDNAV_DVD_TYPES_H /* * DVD Menu ID < at >< at > -275,4 +275,4 < at >< at > typedef int DVDVideoCompression_t; #endif -#endif /* DVD_H_INCLUDED */ +#endif /* LIBDVDNAV_DVD_TYPES_H */ Modified: trunk/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h(original) +++ trunk/libdvdnav/src/dvdnav.hSun Sep 14 22:11:17 2008 < at >< at > -26,8 +26,8 < at >< at > * to access dvdnav functionality. */ -#ifndef DVDNAV_H_INCLUDED -#define DVDNAV_H_INCLUDED +#ifndef LIBDVDNAV_DVDNAV_H +#define LIBDVDNAV_DVDNAV_H #define MP_DVDNAV 1 < at >< at > -681,4 +681,4 < at >< at > int8_t dvdnav_is_domain_vts(dvdnav_t *se } #endif -#endif /* DVDNAV_H_INCLUDED */ +#endif /* LIBDVDNAV_DVDNAV_H */ Modified: trunk/libdvdnav/src/dvdnav_events.h ============================================================================== --- trunk/libdvdnav/src/dvdnav_events.h(original) +++ trunk/libdvdnav/src/dvdnav_events.hSun Sep 14 22:11:17 2008 < at >< at > -25,8 +25,8 < at >< at > * This header defines events and event types */ -#ifndef DVDNAV_EVENTS_H_INCLUDED -#define DVDNAV_EVENTS_H_INCLUDED +#ifndef LIBDVDNAV_DVDNAV_EVENTS_H +#define LIBDVDNAV_DVDNAV_EVENTS_H /* * DVDNAV_BLOCK_OK < at >< at > -236,4 +236,4 < at >< at > typedef struct { #define DVDNAV_WAIT13 -#endif /* DVDNAV_EVENTS_H_INCLUDED */ +#endif /* LIBDVDNAV_DVDNAV_EVENTS_H */ Modified: trunk/libdvdnav/src/dvdnav_internal.h ============================================================================== --- trunk/libdvdnav/src/dvdnav_internal.h(original) +++ trunk/libdvdnav/src/dvdnav_internal.hSun Sep 14 22:11:17 2008 < at >< at > -21,8 +21,8 < at >< at > * */ -#ifndef DVDNAV_INTERNAL_H_INCLUDED -#define DVDNAV_INTERNAL_H_INCLUDED +#ifndef LIBDVDNAV_DVDNAV_INTERNAL_H +#define LIBDVDNAV_DVDNAV_INTERNAL_H #ifdef HAVE_CONFIG_H #include "config.h" < at >< at > -195,4 +195,4 < at >< at > int64_t dvdnav_convert_time(dvd_time_t * #define printerr(str) \ do { if (this) strncpy(this->err_str, str, MAX_ERR_LEN - 1); } while (0) -#endif /* DVDNAV_INTERNAL_H_INCLUDED */ +#endif /* LIBDVDNAV_DVDNAV_INTERNAL_H */ Modified: trunk/libdvdnav/src/read_cache.h ============================================================================== --- trunk/libdvdnav/src/read_cache.h(original) +++ trunk/libdvdnav/src/read_cache.hSun Sep 14 22:11:17 2008 < at >< at > -21,8 +21,8 < at >< at > * */ -#ifndef __DVDNAV_READ_CACHE_H -#define __DVDNAV_READ_CACHE_H +#ifndef LIBDVDNAV_READ_CACHE_H +#define LIBDVDNAV_READ_CACHE_H /* Opaque cache type -- defined in dvdnav_internal.h */ /* typedef struct read_cache_s read_cache_t; */ < at >< at > -46,4 +46,4 < at >< at > void dvdnav_pre_cache_blocks(read_cache_ * Those buffers must _never_ be freed. */ int dvdnav_read_cache_block(read_cache_t *self, int sector, size_t block_count, uint8_t **buf); -#endif /* __DVDNAV_READ_CACHE_H */ +#endif /* LIBDVDNAV_READ_CACHE_H */ Modified: trunk/libdvdnav/src/remap.h ============================================================================== --- trunk/libdvdnav/src/remap.h(original) +++ trunk/libdvdnav/src/remap.hSun Sep 14 22:11:17 2008 < at >< at > -18,8 +18,8 < at >< at > * $Id$ */ -#ifndef __REMAP__H -#define __REMAP__H +#ifndef LIBDVDNAV_REMAP_H +#define LIBDVDNAV_REMAP_H typedef struct block_s block_t; typedef struct remap_s remap_t; < at >< at > -30,4 +30,4 < at >< at > unsigned long remap_block( remap_t *map, int domain, int title, int program, unsigned long cblock, unsigned long offset); -#endif +#endif /* LIBDVDNAV_REMAP_H */ Modified: trunk/libdvdnav/src/vm/decoder.h ============================================================================== --- trunk/libdvdnav/src/vm/decoder.h(original) +++ trunk/libdvdnav/src/vm/decoder.hSun Sep 14 22:11:17 2008 < at >< at > -22,8 +22,8 < at >< at > * */ -#ifndef DECODER_H_INCLUDED -#define DECODER_H_INCLUDED +#ifndef LIBDVDNAV_DECODER_H +#define LIBDVDNAV_DECODER_H /* link command types */ typedef enum { < at >< at > -109,4 +109,4 < at >< at > void vm_print_link(link_t value); void vm_print_registers( registers_t *registers ); #endif -#endif /* DECODER_H_INCLUDED */ +#endif /* LIBDVDNAV_DECODER_H */ Modified: trunk/libdvdnav/src/vm/vm.h ============================================================================== --- trunk/libdvdnav/src/vm/vm.h(original) +++ trunk/libdvdnav/src/vm/vm.hSun Sep 14 22:11:17 2008 < at >< at > -23,8 +23,8 < at >< at > * */ -#ifndef VM_H_INCLUDED -#define VM_H_INCLUDED +#ifndef LIBDVDNAV_VM_H +#define LIBDVDNAV_VM_H /* DOMAIN enum */ < at >< at > -179,4 +179,4 < at >< at > void vm_position_print(vm_t *vm, vm_posi #endif -#endif /* VM_HV_INCLUDED */ +#endif /* LIBDVDNAV_VM_H */ Modified: trunk/libdvdnav/src/vm/vmcmd.h ============================================================================== --- trunk/libdvdnav/src/vm/vmcmd.h(original) +++ trunk/libdvdnav/src/vm/vmcmd.hSun Sep 14 22:11:17 2008 < at >< at > -22,10 +22,10 < at >< at > * */ -#ifndef VMCMD_H_INCLUDED -#define VMCMD_H_INCLUDED +#ifndef LIBDVDNAV_VMCMD_H +#define LIBDVDNAV_VMCMD_H void vm_print_mnemonic(vm_cmd_t *command); void vm_print_cmd(int row, vm_cmd_t *command); -#endif /* VMCMD_H_INCLUDED */ +#endif /* LIBDVDNAV_VMCMD_H */ diego 2008-09-14T20:11:17 http://comments.gmane.org/gmane.comp.video.dvdnav.general/650 libdvdread and libdvdnav are full of - $Id$ - $Log$ - extern "C" - missing license headers I would like to remove/fix all of these. OK to proceed? Also, it seems that you recently removed all trailing whitespace from the code. Shall I enable the pre-commit hook to check for added trailing whitespace? Diego Diego Biurrun 2008-09-14T19:50:17 http://comments.gmane.org/gmane.comp.video.dvdnav.general/649 I want to propose adding proper multiple inclusion guards to both libdvdread and libdvdnav, i.e. #ifndef LIBDVDREAD_NAV_PRINT_H #define LIBDVDREAD_NAV_PRINT_H instead of #ifndef NAV_PRINT_H_INCLUDED #define NAV_PRINT_H_INCLUDED I have already done this to my local trees, but attaching large patches would be pointless. OK to make the change? Diego Diego Biurrun 2008-09-14T19:22:16 http://comments.gmane.org/gmane.comp.video.dvdnav.general/648 Author: diego Date: Sun Sep 14 18:05:09 2008 New Revision: 1140 Log: Convert all ISO8859-1 sequences to proper UTF-8. Modified: trunk/libdvdnav/src/dvd_types.h trunk/libdvdnav/src/vm/decoder.c trunk/libdvdnav/src/vm/decoder.h trunk/libdvdnav/src/vm/vm.c trunk/libdvdnav/src/vm/vm.h trunk/libdvdnav/src/vm/vmcmd.c trunk/libdvdnav/src/vm/vmcmd.h Modified: trunk/libdvdnav/src/dvd_types.h ============================================================================== --- trunk/libdvdnav/src/dvd_types.h(original) +++ trunk/libdvdnav/src/dvd_types.hSun Sep 14 18:05:09 2008 < at >< at > -1,5 +1,5 < at >< at > /* - * Copyright (C) 2000, 2001 Bj_______________________________________________ DVDnav-discuss mailing list DVDnav-discuss-4+PuYLO5yA7jufZW15ZwLg< at >public.gmane.org https://lists.mplayerhq.hu/mailman/listinfo/dvdnav-discuss diego 2008-09-14T16:05:09 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.video.dvdnav.general