mirror of
https://github.com/mpv-player/mpv
synced 2024-12-28 06:03:45 +01:00
[TRIVIAL] More translatables to help_mp and printfs to mp_msg on libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16968 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
09ed4549eb
commit
8318fcd06b
@ -1323,3 +1323,53 @@ static char help_text[]=
|
||||
#define MSGTR_MPDEMUX_AVIHDR_IdxGeneratedForHowManyChunks "AVI: Generated index table for %d chunks!\n"
|
||||
#define MSGTR_MPDEMUX_AVIHDR_Failed2WriteIdxFile "Couldn't write index file %s: %s\n"
|
||||
#define MSGTR_MPDEMUX_AVIHDR_IdxFileSaved "Saved index file: %s\n"
|
||||
|
||||
// cache2.c
|
||||
|
||||
#define MSGTR_MPDEMUX_CACHE2_NonCacheableStream "\rThis stream is non-cacheable\n"
|
||||
#define MSGTR_MPDEMUX_CACHE2_ReadFileposDiffers "!!! read_filepos differs!!! report this bug...\n"
|
||||
|
||||
// cdda.c
|
||||
|
||||
#define MSGTR_MPDEMUX_CDDA_CantOpenCDDADevice "Can't open cdda device\n"
|
||||
#define MSGTR_MPDEMUX_CDDA_CantOpenDisc "Can't open disc\n"
|
||||
#define MSGTR_MPDEMUX_CDDA_AudioCDFoundWithNTracks "Found Audio CD with %d tracks\n"
|
||||
|
||||
// cddb.c
|
||||
|
||||
#define MSGTR_MPDEMUX_CDDB_FailedToReadTOC "Failed to read TOC.\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_FailedToOpenDevice "Failed to open %s device.\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_NotAValidURL "Not a valid URL\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_FailedToSendHTTPRequest "failed to send the http request\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_FailedToReadHTTPResponse "Failed to read the http response\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_HTTPErrorNOTFOUND "Not Found\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_HTTPErrorUnknown "Unknown Error code\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_NoCacheFound "No cache found\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_NotAllXMCDFileHasBeenRead "Not all the xmcd file has been read\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_FailedToCreateDirectory "Failed to create directory %s\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_NotAllXMCDFileHasBeenWritten "Not all the xmcd file has been written\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_InvalidXMCDDatabaseReturned "Invalid xmcd database file returned\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_UnexpectedFIXME "Unexpected fix me\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_UnhandledCode "Unhandled code\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_UnableToFindEOL "Unable to find end of line\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle "Parse OK, found: %s\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_AlbumNotFound "Album not found\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_ServerReturnsCommandSyntaxErr "Server returns: Command syntax error\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_NoSitesInfoAvailable "No sites information available\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_FailedToGetProtocolLevel "Failed to get the protocol level\n"
|
||||
#define MSGTR_MPDEMUX_CDDB_NoCDInDrive "No CD in the drive\n"
|
||||
|
||||
// cue_read.c
|
||||
|
||||
#define MSGTR_MPDEMUX_CUEREAD_UnexpectedCuefileLine "[bincue] Unexpected cuefile line: %s\n"
|
||||
#define MSGTR_MPDEMUX_CUEREAD_BinFilenameTested "[bincue] bin filename tested: %s\n"
|
||||
#define MSGTR_MPDEMUX_CUEREAD_CannotFindBinFile "[bincue] couldn't find the bin file - giving up\n"
|
||||
#define MSGTR_MPDEMUX_CUEREAD_UsingBinFile "[bincue] using bin file %s\n"
|
||||
#define MSGTR_MPDEMUX_CUEREAD_UnknownModeForBinfile "[bincue] unknown mode for binfile. should not happen. aborting\n"
|
||||
#define MSGTR_MPDEMUX_CUEREAD_CannotOpenCueFile "[bincue] cannot open %s\n"
|
||||
#define MSGTR_MPDEMUX_CUEREAD_ErrReadingFromCueFile "[bincue] error reading from %s\n"
|
||||
#define MSGTR_MPDEMUX_CUEREAD_ErrGettingBinFileSize "[bincue] error getting size of bin file\n"
|
||||
#define MSGTR_MPDEMUX_CUEREAD_InfoTrackFormat "track %02d: format=%d %02d:%02d:%02d\n"
|
||||
#define MSGTR_MPDEMUX_CUEREAD_UnexpectedBinFileEOF "[bincue] unexpected end of bin file\n"
|
||||
#define MSGTR_MPDEMUX_CUEREAD_CannotReadNBytesOfPayload "[bincue] couldn't read %d bytes of payload\n"
|
||||
#define MSGTR_MPDEMUX_CUEREAD_CueStreamInfo_FilenameTrackTracksavail "CUE stream_open, filename=%s, track=%d, available tracks: %d -> %d\n"
|
||||
|
@ -13,6 +13,9 @@
|
||||
|
||||
#include "cdd.h"
|
||||
|
||||
#include "mp_msg.h"
|
||||
#include "help_mp.h"
|
||||
|
||||
#ifndef CD_FRAMESIZE_RAW
|
||||
#define CD_FRAMESIZE_RAW CDIO_CD_FRAMESIZE_RAW
|
||||
#endif
|
||||
@ -146,7 +149,7 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) {
|
||||
#endif
|
||||
|
||||
if(!cdd) {
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,"Can't open cdda device\n");
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_MPDEMUX_CDDA_CantOpenCDDADevice);
|
||||
m_struct_free(&stream_opts,opts);
|
||||
return STREAM_ERROR;
|
||||
}
|
||||
@ -161,14 +164,14 @@ static int open_cdda(stream_t *st,int m, void* opts, int* file_format) {
|
||||
}
|
||||
|
||||
if(cdda_open(cdd) != 0) {
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,"Can't open disc\n");
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_MPDEMUX_CDDA_CantOpenDisc);
|
||||
cdda_close(cdd);
|
||||
m_struct_free(&stream_opts,opts);
|
||||
return STREAM_ERROR;
|
||||
}
|
||||
|
||||
cd_info = cd_info_new();
|
||||
mp_msg(MSGT_OPEN,MSGL_INFO,"Found Audio CD with %d tracks\n",cdda_tracks(cdd));
|
||||
mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_MPDEMUX_CDDA_AudioCDFoundWithNTracks,cdda_tracks(cdd));
|
||||
for(i=0;i<cdd->tracks;i++) {
|
||||
char track_name[80];
|
||||
long sec=cdda_track_firstsector(cdd,i+1);
|
||||
|
@ -36,6 +36,9 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#include "mp_msg.h"
|
||||
#include "help_mp.h"
|
||||
|
||||
#if defined(__linux__)
|
||||
#include <linux/cdrom.h>
|
||||
#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
|
||||
@ -106,7 +109,7 @@ read_toc(const char *dev) {
|
||||
drive = CreateFile(device, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
|
||||
|
||||
if(!DeviceIoControl(drive, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(CDROM_TOC), &r, 0)) {
|
||||
mp_msg(MSGT_OPEN, MSGL_ERR, "Failed to read TOC.\n");
|
||||
mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToReadTOC);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -220,7 +223,7 @@ int cdd_identify(const char *dev)
|
||||
int i, min, sec, frame;
|
||||
cdtoc_last_track = read_toc(dev);
|
||||
if (cdtoc_last_track < 0) {
|
||||
mp_msg(MSGT_OPEN, MSGL_ERR, "Failed to open %s device.\n", dev);
|
||||
mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToOpenDevice, dev);
|
||||
return -1;
|
||||
}
|
||||
mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CDDA_TRACKS=%d\n", cdtoc_last_track);
|
||||
@ -279,19 +282,19 @@ cddb_http_request(char *command, int (*reply_parser)(HTTP_header_t*,cddb_data_t*
|
||||
|
||||
url = url_new(request);
|
||||
if( url==NULL ) {
|
||||
printf("Not a valid URL\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_NotAValidURL);
|
||||
return -1;
|
||||
}
|
||||
|
||||
fd = http_send_request(url,0);
|
||||
if( fd<0 ) {
|
||||
printf("failed to send the http request\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToSendHTTPRequest);
|
||||
return -1;
|
||||
}
|
||||
|
||||
http_hdr = http_read_response( fd );
|
||||
if( http_hdr==NULL ) {
|
||||
printf("Failed to read the http response\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToReadHTTPResponse);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -303,10 +306,10 @@ cddb_http_request(char *command, int (*reply_parser)(HTTP_header_t*,cddb_data_t*
|
||||
ret = reply_parser(http_hdr, cddb_data);
|
||||
break;
|
||||
case 400:
|
||||
printf("Not Found\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_HTTPErrorNOTFOUND);
|
||||
break;
|
||||
default:
|
||||
printf("Unknown Error code\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_HTTPErrorUnknown);
|
||||
}
|
||||
|
||||
http_free( http_hdr );
|
||||
@ -332,7 +335,7 @@ cddb_read_cache(cddb_data_t *cddb_data) {
|
||||
#endif
|
||||
);
|
||||
if( file_fd<0 ) {
|
||||
printf("No cache found\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_NoCacheFound);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -346,13 +349,13 @@ cddb_read_cache(cddb_data_t *cddb_data) {
|
||||
|
||||
cddb_data->xmcd_file = (char*)malloc(file_size);
|
||||
if( cddb_data->xmcd_file==NULL ) {
|
||||
printf("Memory allocation failed\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MemAllocFailed);
|
||||
close(file_fd);
|
||||
return -1;
|
||||
}
|
||||
cddb_data->xmcd_file_size = read(file_fd, cddb_data->xmcd_file, file_size);
|
||||
if( cddb_data->xmcd_file_size!=file_size ) {
|
||||
printf("Not all the xmcd file has been read\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_WARN, MSGTR_MPDEMUX_CDDB_NotAllXMCDFileHasBeenRead);
|
||||
close(file_fd);
|
||||
return -1;
|
||||
}
|
||||
@ -383,7 +386,7 @@ cddb_write_cache(cddb_data_t *cddb_data) {
|
||||
if( ret<0 ) {
|
||||
#endif
|
||||
perror("mkdir");
|
||||
printf("Failed to create directory %s\n", cddb_data->cache_dir );
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToCreateDirectory, cddb_data->cache_dir);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@ -403,7 +406,7 @@ cddb_write_cache(cddb_data_t *cddb_data) {
|
||||
return -1;
|
||||
}
|
||||
if( (unsigned int)wrote!=cddb_data->xmcd_file_size ) {
|
||||
printf("Not all the xmcd file has been written\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_WARN, MSGTR_MPDEMUX_CDDB_NotAllXMCDFileHasBeenWritten);
|
||||
close(file_fd);
|
||||
return -1;
|
||||
}
|
||||
@ -424,7 +427,7 @@ cddb_read_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
|
||||
ret = sscanf( http_hdr->body, "%d ", &status);
|
||||
if( ret!=1 ) {
|
||||
printf("Parse error\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -432,13 +435,13 @@ cddb_read_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
case 210:
|
||||
ret = sscanf( http_hdr->body, "%d %s %08lx", &status, category, &disc_id);
|
||||
if( ret!=3 ) {
|
||||
printf("Parse error\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
|
||||
return -1;
|
||||
}
|
||||
// Check if it's a xmcd database file
|
||||
ptr = strstr(http_hdr->body, "# xmcd");
|
||||
if( ptr==NULL ) {
|
||||
printf("Invalid xmcd database file returned\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_InvalidXMCDDatabaseReturned);
|
||||
return -1;
|
||||
}
|
||||
// Ok found the beginning of the file
|
||||
@ -447,14 +450,14 @@ cddb_read_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
if( ptr2==NULL ) {
|
||||
ptr2 = strstr(ptr, "\n.\n");
|
||||
if( ptr2==NULL ) {
|
||||
printf("Unable to find '.'\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_FIXME, "Unable to find '.'\n");
|
||||
ptr2=ptr+strlen(ptr); //return -1;
|
||||
}
|
||||
}
|
||||
// Ok found the end
|
||||
// do a sanity check
|
||||
if( http_hdr->body_size<(unsigned int)(ptr2-ptr) ) {
|
||||
printf("Unexpected fix me\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_UnexpectedFIXME);
|
||||
return -1;
|
||||
}
|
||||
cddb_data->xmcd_file = ptr;
|
||||
@ -465,7 +468,7 @@ cddb_read_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
http_hdr->body_size = 0;
|
||||
return cddb_write_cache(cddb_data);
|
||||
default:
|
||||
printf("Unhandled code\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_FIXME, MSGTR_MPDEMUX_CDDB_UnhandledCode);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -485,7 +488,7 @@ cddb_parse_matches_list(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
|
||||
ptr = strstr(http_hdr->body, "\n");
|
||||
if( ptr==NULL ) {
|
||||
printf("Unable to find end of line\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_UnableToFindEOL);
|
||||
return -1;
|
||||
}
|
||||
ptr++;
|
||||
@ -493,7 +496,7 @@ cddb_parse_matches_list(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
// So let's take the first one.
|
||||
ret = sscanf(ptr, "%s %08lx %s", cddb_data->category, &(cddb_data->disc_id), album_title);
|
||||
if( ret!=3 ) {
|
||||
printf("Parse error\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
|
||||
return -1;
|
||||
}
|
||||
ptr = strstr(http_hdr->body, album_title);
|
||||
@ -509,7 +512,7 @@ cddb_parse_matches_list(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
strncpy(album_title, ptr, len);
|
||||
album_title[len-2]='\0';
|
||||
}
|
||||
printf("Parse OK, found: %s\n", album_title);
|
||||
mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -521,7 +524,7 @@ cddb_query_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
|
||||
ret = sscanf( http_hdr->body, "%d ", &status);
|
||||
if( ret!=1 ) {
|
||||
printf("Parse error\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -530,7 +533,7 @@ cddb_query_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
// Found exact match
|
||||
ret = sscanf(http_hdr->body, "%d %s %08lx %s", &status, cddb_data->category, &(cddb_data->disc_id), album_title);
|
||||
if( ret!=4 ) {
|
||||
printf("Parse error\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
|
||||
return -1;
|
||||
}
|
||||
ptr = strstr(http_hdr->body, album_title);
|
||||
@ -546,11 +549,11 @@ cddb_query_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
strncpy(album_title, ptr, len);
|
||||
album_title[len-2]='\0';
|
||||
}
|
||||
printf("Parse OK, found: %s\n", album_title);
|
||||
mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
|
||||
return cddb_request_titles(cddb_data);
|
||||
case 202:
|
||||
// No match found
|
||||
printf("Album not found\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_WARN, MSGTR_MPDEMUX_CDDB_AlbumNotFound);
|
||||
break;
|
||||
case 210:
|
||||
// Found exact matches, list follows
|
||||
@ -568,10 +571,10 @@ blues c711930d Santana / Supernatural
|
||||
cddb_parse_matches_list(http_hdr, cddb_data);
|
||||
return cddb_request_titles(cddb_data);
|
||||
case 500:
|
||||
printf("Server returns: Command syntax error\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_FIXME, MSGTR_MPDEMUX_CDDB_ServerReturnsCommandSyntaxErr);
|
||||
break;
|
||||
default:
|
||||
printf("Unhandled code\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_FIXME, MSGTR_MPDEMUX_CDDB_UnhandledCode);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@ -584,7 +587,7 @@ cddb_proto_level_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
|
||||
ret = sscanf( http_hdr->body, "%d ", &status);
|
||||
if( ret!=1 ) {
|
||||
printf("Parse error\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -592,18 +595,18 @@ cddb_proto_level_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
case 210:
|
||||
ptr = strstr(http_hdr->body, "max proto:");
|
||||
if( ptr==NULL ) {
|
||||
printf("Parse error\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
|
||||
return -1;
|
||||
}
|
||||
ret = sscanf(ptr, "max proto: %d", &max);
|
||||
if( ret!=1 ) {
|
||||
printf("Parse error\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
|
||||
return -1;
|
||||
}
|
||||
cddb_data->freedb_proto_level = max;
|
||||
return 0;
|
||||
default:
|
||||
printf("Unhandled code\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_FIXME, MSGTR_MPDEMUX_CDDB_UnhandledCode);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@ -619,7 +622,7 @@ cddb_freedb_sites_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
|
||||
ret = sscanf( http_hdr->body, "%d ", &status);
|
||||
if( ret!=1 ) {
|
||||
printf("Parse error\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -629,10 +632,10 @@ cddb_freedb_sites_parse(HTTP_header_t *http_hdr, cddb_data_t *cddb_data) {
|
||||
ret = cddb_data->anonymous; // For gcc complaining about unused parameter.
|
||||
return 0;
|
||||
case 401:
|
||||
printf("No sites information available\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_FIXME, MSGTR_MPDEMUX_CDDB_NoSitesInfoAvailable);
|
||||
break;
|
||||
default:
|
||||
printf("Unhandled code\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_FIXME, MSGTR_MPDEMUX_CDDB_UnhandledCode);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@ -685,7 +688,7 @@ cddb_retrieve(cddb_data_t *cddb_data) {
|
||||
|
||||
cddb_create_hello(cddb_data);
|
||||
if( cddb_get_proto_level(cddb_data)<0 ) {
|
||||
printf("Failed to get the protocol level\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToGetProtocolLevel);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -711,7 +714,7 @@ cddb_resolve(const char *dev, char **xmcd_file) {
|
||||
{
|
||||
cdtoc_last_track = read_toc(dev);
|
||||
if (cdtoc_last_track < 0) {
|
||||
printf("Failed to open %s device.\n", dev);
|
||||
mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToOpenDevice, dev);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@ -722,7 +725,7 @@ cddb_resolve(const char *dev, char **xmcd_file) {
|
||||
// Check if there is a CD in the drive
|
||||
// FIXME: That's not really a good way to check
|
||||
if( cddb_data.disc_id==0 ) {
|
||||
printf("No CD in the drive\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_NoCDInDrive);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -738,7 +741,7 @@ cddb_resolve(const char *dev, char **xmcd_file) {
|
||||
} else {
|
||||
cddb_data.cache_dir = (char*)malloc(strlen(home_dir)+strlen(cddb_cache_dir)+1);
|
||||
if( cddb_data.cache_dir==NULL ) {
|
||||
printf("Memory allocation failed\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MemAllocFailed);
|
||||
return -1;
|
||||
}
|
||||
sprintf(cddb_data.cache_dir, "%s%s", home_dir, cddb_cache_dir );
|
||||
|
@ -11,7 +11,8 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "mp_msg.h"
|
||||
#include "help_mp.h"
|
||||
#include "cdd.h"
|
||||
|
||||
/*******************************************************************************************************************
|
||||
@ -26,7 +27,7 @@ cd_info_new() {
|
||||
|
||||
cd_info = (cd_info_t*)malloc(sizeof(cd_info_t));
|
||||
if( cd_info==NULL ) {
|
||||
printf("Memory allocation failed\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MemAllocFailed);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -60,14 +61,14 @@ cd_info_add_track(cd_info_t *cd_info, char *track_name, unsigned int track_nb, u
|
||||
|
||||
cd_track = (cd_track_t*)malloc(sizeof(cd_track_t));
|
||||
if( cd_track==NULL ) {
|
||||
printf("Memory allocation failed\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MemAllocFailed);
|
||||
return NULL;
|
||||
}
|
||||
memset(cd_track, 0, sizeof(cd_track_t));
|
||||
|
||||
cd_track->name = (char*)malloc(strlen(track_name)+1);
|
||||
if( cd_track->name==NULL ) {
|
||||
printf("Memory allocation failed\n");
|
||||
mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MemAllocFailed);
|
||||
free(cd_track);
|
||||
return NULL;
|
||||
}
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
#include "config.h"
|
||||
#include "mp_msg.h"
|
||||
//#include "help_mp.h"
|
||||
#include "help_mp.h"
|
||||
|
||||
#include "stream.h"
|
||||
|
||||
@ -150,7 +150,7 @@ static int cue_getTrackinfo(char *Line, tTrack *track)
|
||||
else if (strncmp(&Line[4], "PREGAP ", 7)==0) { ; /* ignore */ }
|
||||
else if (strncmp(&Line[4], "FLAGS ", 6)==0) { ; /* ignore */ }
|
||||
else mp_msg (MSGT_OPEN,MSGL_INFO,
|
||||
"[bincue] Unexpected cuefile line: %s\n", Line);
|
||||
MSGTR_MPDEMUX_CUEREAD_UnexpectedCuefileLine, Line);
|
||||
}
|
||||
return(0);
|
||||
}
|
||||
@ -201,7 +201,7 @@ static int cue_find_bin (char *firstline) {
|
||||
fd_bin = open (bin_filename, O_RDONLY);
|
||||
if (fd_bin == -1)
|
||||
{
|
||||
mp_msg(MSGT_OPEN,MSGL_STATUS, "[bincue] bin filename tested: %s\n",
|
||||
mp_msg(MSGT_OPEN,MSGL_STATUS, MSGTR_MPDEMUX_CUEREAD_BinFilenameTested,
|
||||
bin_filename);
|
||||
|
||||
/* now try to find it with the path of the cue file */
|
||||
@ -210,7 +210,7 @@ static int cue_find_bin (char *firstline) {
|
||||
if (fd_bin == -1)
|
||||
{
|
||||
mp_msg(MSGT_OPEN,MSGL_STATUS,
|
||||
"[bincue] bin filename tested: %s\n", s);
|
||||
MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s);
|
||||
/* now I would say the whole filename is shit, build our own */
|
||||
strncpy(s, cue_filename, strlen(cue_filename) - 3 );
|
||||
s[strlen(cue_filename) - 3] = '\0';
|
||||
@ -219,7 +219,7 @@ static int cue_find_bin (char *firstline) {
|
||||
if (fd_bin == -1)
|
||||
{
|
||||
mp_msg(MSGT_OPEN,MSGL_STATUS,
|
||||
"[bincue] bin filename tested: %s\n", s);
|
||||
MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s);
|
||||
|
||||
/* ok try it with path */
|
||||
snprintf(t, sizeof( t ), "%s/%s", bincue_path, s);
|
||||
@ -227,7 +227,7 @@ static int cue_find_bin (char *firstline) {
|
||||
if (fd_bin == -1)
|
||||
{
|
||||
mp_msg(MSGT_OPEN,MSGL_STATUS,
|
||||
"[bincue] bin filename tested: %s\n",t);
|
||||
MSGTR_MPDEMUX_CUEREAD_BinFilenameTested,t);
|
||||
/* now I would say the whole filename is shit, build our own */
|
||||
strncpy(s, cue_filename, strlen(cue_filename) - 3 );
|
||||
s[strlen(cue_filename) - 3] = '\0';
|
||||
@ -236,18 +236,18 @@ static int cue_find_bin (char *firstline) {
|
||||
if (fd_bin == -1)
|
||||
{
|
||||
mp_msg(MSGT_OPEN,MSGL_STATUS,
|
||||
"[bincue] bin filename tested: %s \n", s);
|
||||
MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s);
|
||||
/* ok try it with path */
|
||||
snprintf(t, sizeof( t ), "%s/%s", bincue_path, s);
|
||||
fd_bin = open (t, O_RDONLY);
|
||||
if (fd_bin == -1)
|
||||
{
|
||||
mp_msg(MSGT_OPEN,MSGL_STATUS,
|
||||
"[bincue] bin filename tested: %s\n", s);
|
||||
MSGTR_MPDEMUX_CUEREAD_BinFilenameTested, s);
|
||||
|
||||
/* I'll give up */
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,
|
||||
"[bincue] couldn't find the bin file - giving up\n");
|
||||
MSGTR_MPDEMUX_CUEREAD_CannotFindBinFile);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
@ -260,7 +260,7 @@ static int cue_find_bin (char *firstline) {
|
||||
}
|
||||
|
||||
mp_msg(MSGT_OPEN,MSGL_INFO,
|
||||
"[bincue] using bin file %s\n", bin_filename);
|
||||
MSGTR_MPDEMUX_CUEREAD_UsingBinFile, bin_filename);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -294,7 +294,7 @@ static inline int cue_mode_2_sector_size(int mode)
|
||||
|
||||
default:
|
||||
mp_msg(MSGT_OPEN,MSGL_FATAL,
|
||||
"[bincue] unknown mode for binfile. should not happen. aborting\n");
|
||||
MSGTR_MPDEMUX_CUEREAD_UnknownModeForBinfile);
|
||||
abort();
|
||||
}
|
||||
|
||||
@ -345,7 +345,7 @@ static int cue_read_cue (char *in_cue_filename)
|
||||
if (fd_cue == NULL)
|
||||
{
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,
|
||||
"[bincue] cannot open %s\n", in_cue_filename);
|
||||
MSGTR_MPDEMUX_CUEREAD_CannotOpenCueFile, in_cue_filename);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -355,7 +355,7 @@ static int cue_read_cue (char *in_cue_filename)
|
||||
if(! fgets( sLine, 256, fd_cue ) )
|
||||
{
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,
|
||||
"[bincue] error reading from %s\n", in_cue_filename);
|
||||
MSGTR_MPDEMUX_CUEREAD_ErrReadingFromCueFile, in_cue_filename);
|
||||
fclose (fd_cue);
|
||||
return -1;
|
||||
}
|
||||
@ -371,7 +371,7 @@ static int cue_read_cue (char *in_cue_filename)
|
||||
if(! fgets( sLine, 256, fd_cue ) )
|
||||
{
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,
|
||||
"[bincue] error reading from %s\n", in_cue_filename);
|
||||
MSGTR_MPDEMUX_CUEREAD_ErrReadingFromCueFile, in_cue_filename);
|
||||
fclose (fd_cue);
|
||||
return -1;
|
||||
}
|
||||
@ -381,7 +381,7 @@ static int cue_read_cue (char *in_cue_filename)
|
||||
if (cue_getTrackinfo(sLine, &tracks[nTracks++]) != 0)
|
||||
{
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,
|
||||
"[bincue] error reading from %s\n", in_cue_filename);
|
||||
MSGTR_MPDEMUX_CUEREAD_ErrReadingFromCueFile, in_cue_filename);
|
||||
fclose (fd_cue);
|
||||
return -1;
|
||||
}
|
||||
@ -390,7 +390,7 @@ static int cue_read_cue (char *in_cue_filename)
|
||||
/* make a fake track with stands for the Lead out */
|
||||
if (fstat (fd_bin, &filestat) == -1) {
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,
|
||||
"[bincue] error getting size of bin file\n");
|
||||
MSGTR_MPDEMUX_CUEREAD_ErrGettingBinFileSize);
|
||||
fclose (fd_cue);
|
||||
return -1;
|
||||
}
|
||||
@ -485,7 +485,7 @@ static void cue_vcd_read_toc(){
|
||||
for (i = 0; i < nTracks; ++i) {
|
||||
|
||||
mp_msg(MSGT_OPEN,MSGL_INFO,
|
||||
"track %02d: format=%d %02d:%02d:%02d\n",
|
||||
MSGTR_MPDEMUX_CUEREAD_InfoTrackFormat,
|
||||
i+1,
|
||||
tracks[i].mode,
|
||||
tracks[i].minute,
|
||||
@ -511,12 +511,12 @@ static int cue_vcd_read(stream_t *stream, char *mem, int size) {
|
||||
return 0;
|
||||
|
||||
if(lseek(fd_bin, position+VCD_SECTOR_OFFS, SEEK_SET) == -1) {
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR, "[bincue] unexpected end of bin file\n");
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_UnexpectedBinFileEOF);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if(read(fd_bin, mem, VCD_SECTOR_DATA) != VCD_SECTOR_DATA) {
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR, "[bincue] couldn't read %d bytes of payload\n", VCD_SECTOR_DATA);
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_MPDEMUX_CUEREAD_CannotReadNBytesOfPayload, VCD_SECTOR_DATA);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -575,7 +575,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
|
||||
mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_ErrTrackSelect " (seek)\n");
|
||||
return STREAM_UNSUPORTED;
|
||||
}
|
||||
mp_msg(MSGT_OPEN,MSGL_INFO,"CUE stream_open, filename=%s, track=%d, available tracks: %d -> %d\n", filename, track, ret, ret2);
|
||||
mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_MPDEMUX_CUEREAD_CueStreamInfo_FilenameTrackTracksavail, filename, track, ret, ret2);
|
||||
|
||||
stream->fd = f;
|
||||
stream->type = STREAMTYPE_VCDBINCUE;
|
||||
|
Loading…
Reference in New Issue
Block a user