Mercurial > mplayer.hg
changeset 24257:d261f5109660
cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
author | diego |
---|---|
date | Tue, 28 Aug 2007 22:38:45 +0000 |
parents | 587555a43c76 |
children | aacc9eeba8a2 |
files | libmpdemux/demux_mpg.c libmpdemux/demuxer.c libmpdemux/muxer_lavf.c stream/asf_streaming.c stream/http.c stream/pnm.c stream/stream.c stream/stream.h stream/stream_cdda.c stream/stream_cue.c stream/stream_dvb.c stream/stream_dvd.c stream/stream_dvdnav.c stream/stream_file.c stream/stream_ftp.c stream/stream_livedotcom.c stream/stream_netstream.c stream/stream_pvr.c stream/stream_radio.c stream/stream_rtp.c stream/stream_rtsp.c stream/stream_smb.c stream/stream_udp.c stream/stream_vcd.c stream/stream_vstream.c |
diffstat | 25 files changed, 62 insertions(+), 62 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_mpg.c Tue Aug 28 19:58:45 2007 +0000 +++ b/libmpdemux/demux_mpg.c Tue Aug 28 22:38:45 2007 +0000 @@ -583,7 +583,7 @@ (such as SWIII) will show strange alternations in the stream time, wildly going back and forth */ - if(ds == demux->video && stream_control(demux->stream, STREAM_CTRL_GET_CURRENT_TIME,(void *)&stream_pts)!=STREAM_UNSUPORTED) + if(ds == demux->video && stream_control(demux->stream, STREAM_CTRL_GET_CURRENT_TIME,(void *)&stream_pts)!=STREAM_UNSUPPORTED) dp->stream_pts = stream_pts; ds_add_packet(ds,dp); if (demux->priv && set_pts) ((mpg_demuxer_t*)demux->priv)->last_pts = pts/90000.0f; @@ -992,7 +992,7 @@ switch(cmd) { case DEMUXER_CTRL_GET_TIME_LENGTH: - if(stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, arg) != STREAM_UNSUPORTED) { + if(stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, arg) != STREAM_UNSUPPORTED) { mp_msg(MSGT_DEMUXER,MSGL_DBG2,"\r\nDEMUX_MPG_CTRL, (%.3lf)\r\n", *((double*)arg)); return DEMUXER_CTRL_GUESS; }
--- a/libmpdemux/demuxer.c Tue Aug 28 19:58:45 2007 +0000 +++ b/libmpdemux/demuxer.c Tue Aug 28 22:38:45 2007 +0000 @@ -950,13 +950,13 @@ } if(flags & 2) { // percent seek - if(stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, &tmp) == STREAM_UNSUPORTED) + if(stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, &tmp) == STREAM_UNSUPPORTED) goto dmx_seek; pts += tmp * rel_seek_secs; } else pts += rel_seek_secs; - if(stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_TIME, &pts) != STREAM_UNSUPORTED) { + if(stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_TIME, &pts) != STREAM_UNSUPPORTED) { demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL); return 1; } @@ -1134,7 +1134,7 @@ if (!demuxer->num_chapters || !demuxer->chapters) { if(!mode) { ris = stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_CHAPTER, ¤t); - if(ris == STREAM_UNSUPORTED) return -1; + if(ris == STREAM_UNSUPPORTED) return -1; chapter += current; } @@ -1148,7 +1148,7 @@ ds_free_packs(demuxer->sub); ris = stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_CHAPTER, &chapter); - if(ris != STREAM_UNSUPORTED) + if(ris != STREAM_UNSUPPORTED) demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL); if(sh_video) { ds_fill_buffer(demuxer->video); @@ -1164,7 +1164,7 @@ *seek_pts = -1.0; if(num_chapters) { - if(stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, num_chapters) == STREAM_UNSUPORTED) + if(stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, num_chapters) == STREAM_UNSUPPORTED) *num_chapters = 0; } @@ -1177,7 +1177,7 @@ } } - return (ris != STREAM_UNSUPORTED ? chapter : -1); + return (ris != STREAM_UNSUPPORTED ? chapter : -1); } else { //chapters structure is set in the demuxer total = demuxer->num_chapters;
--- a/libmpdemux/muxer_lavf.c Tue Aug 28 19:58:45 2007 +0000 +++ b/libmpdemux/muxer_lavf.c Tue Aug 28 22:38:45 2007 +0000 @@ -103,7 +103,7 @@ else if(whence == SEEK_END) { off_t size=0; - if(stream_control(muxer->stream, STREAM_CTRL_GET_SIZE, &size) == STREAM_UNSUPORTED || size < pos) + if(stream_control(muxer->stream, STREAM_CTRL_GET_SIZE, &size) == STREAM_UNSUPPORTED || size < pos) return -1; pos = size - pos; }
--- a/stream/asf_streaming.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/asf_streaming.c Tue Aug 28 22:38:45 2007 +0000 @@ -854,14 +854,14 @@ if((!strncmp(stream->url, "http", 4)) && (*file_format!=DEMUXER_TYPE_ASF && *file_format!=DEMUXER_TYPE_UNKNOWN)) { streaming_ctrl_free(stream->streaming_ctrl); stream->streaming_ctrl = NULL; - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } if(asf_streaming_start(stream, file_format) < 0) { mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_MPDEMUX_ASF_StreamingFailed); streaming_ctrl_free(stream->streaming_ctrl); stream->streaming_ctrl = NULL; - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } *file_format = DEMUXER_TYPE_ASF;
--- a/stream/http.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/http.c Tue Aug 28 22:38:45 2007 +0000 @@ -853,7 +853,7 @@ err_out: if (fd > 0) closesocket( fd ); fd = -1; - res = STREAM_UNSUPORTED; + res = STREAM_UNSUPPORTED; http_free( http_hdr ); http_hdr = NULL; out: @@ -882,7 +882,7 @@ stream->fd = -1; streaming_ctrl_free(stream->streaming_ctrl); stream->streaming_ctrl = NULL; - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } fixup_network_stream_cache(stream); @@ -910,7 +910,7 @@ stream->fd = -1; streaming_ctrl_free(stream->streaming_ctrl); stream->streaming_ctrl = NULL; - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } return fixup_open(stream, seekable); @@ -937,7 +937,7 @@ stream->fd = -1; streaming_ctrl_free(stream->streaming_ctrl); stream->streaming_ctrl = NULL; - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } return fixup_open(stream, seekable);
--- a/stream/pnm.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/pnm.c Tue Aug 28 22:38:45 2007 +0000 @@ -906,7 +906,7 @@ fail: streaming_ctrl_free(stream->streaming_ctrl); stream->streaming_ctrl = NULL; - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; }
--- a/stream/stream.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream.c Tue Aug 28 22:38:45 2007 +0000 @@ -220,7 +220,7 @@ *file_format = DEMUXER_TYPE_UNKNOWN; s = open_stream_plugin(sinfo,filename,mode,options,file_format,&r); if(s) return s; - if(r != STREAM_UNSUPORTED) { + if(r != STREAM_UNSUPPORTED) { mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_FailedToOpen,filename); return NULL; } @@ -383,7 +383,7 @@ } int stream_control(stream_t *s, int cmd, void *arg){ - if(!s->control) return STREAM_UNSUPORTED; + if(!s->control) return STREAM_UNSUPPORTED; return s->control(s, cmd, arg); }
--- a/stream/stream.h Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream.h Tue Aug 28 22:38:45 2007 +0000 @@ -45,7 +45,7 @@ //////////// Open return code /// This can't open the requested protocol (used by stream wich have a /// * protocol when they don't know the requested protocol) -#define STREAM_UNSUPORTED -1 +#define STREAM_UNSUPPORTED -1 #define STREAM_ERROR 0 #define STREAM_OK 1
--- a/stream/stream_cdda.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_cdda.c Tue Aug 28 22:38:45 2007 +0000 @@ -114,7 +114,7 @@ if(m != STREAM_READ) { m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } if(!p->device) {
--- a/stream/stream_cue.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_cue.c Tue Aug 28 22:38:45 2007 +0000 @@ -547,12 +547,12 @@ if(mode != STREAM_READ || !p->filename) { m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } filename = strdup(p->filename); if(!filename) { m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } colon = strstr(filename, ":"); if(colon) { @@ -566,14 +566,14 @@ f = cue_read_cue(filename); if(f < 0) { m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } cue_vcd_read_toc(); ret2=cue_vcd_get_track_end(track); ret=cue_vcd_seek_to_track(track); if(ret<0){ mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_ErrTrackSelect " (seek)\n"); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_MPDEMUX_CUEREAD_CueStreamInfo_FilenameTrackTracksavail, filename, track, ret, ret2);
--- a/stream/stream_dvb.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_dvb.c Tue Aug 28 22:38:45 2007 +0000 @@ -666,7 +666,7 @@ if(mode != STREAM_READ) - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; stream->priv = calloc(1, sizeof(dvb_priv_t)); if(stream->priv == NULL)
--- a/stream/stream_dvd.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_dvd.c Tue Aug 28 22:38:45 2007 +0000 @@ -700,29 +700,29 @@ } case STREAM_CTRL_GET_NUM_CHAPTERS: { - if(! d->cur_pgc->nr_of_programs) return STREAM_UNSUPORTED; + if(! d->cur_pgc->nr_of_programs) return STREAM_UNSUPPORTED; *((unsigned int *)arg) = d->cur_pgc->nr_of_programs; return 1; } case STREAM_CTRL_SEEK_TO_CHAPTER: { int r; - if(stream_cache_size > 0) return STREAM_UNSUPORTED; + if(stream_cache_size > 0) return STREAM_UNSUPPORTED; r = seek_to_chapter(stream, d->vts_file, d->tt_srpt, d->cur_title-1, *((unsigned int *)arg)); - if(! r) return STREAM_UNSUPORTED; + if(! r) return STREAM_UNSUPPORTED; return 1; } case STREAM_CTRL_GET_CURRENT_CHAPTER: { - if(stream_cache_size > 0) return STREAM_UNSUPORTED; + if(stream_cache_size > 0) return STREAM_UNSUPPORTED; *((unsigned int *)arg) = dvd_chapter_from_cell(d, d->cur_title-1, d->cur_cell); return 1; } case STREAM_CTRL_GET_CURRENT_TIME: { double tm; - if(stream_cache_size > 0) return STREAM_UNSUPORTED; + if(stream_cache_size > 0) return STREAM_UNSUPPORTED; tm = dvd_get_current_time(stream, 0); if(tm != -1) { *((double *)arg) = tm; @@ -732,13 +732,13 @@ } case STREAM_CTRL_SEEK_TO_TIME: { - if(stream_cache_size > 0) return STREAM_UNSUPORTED; + if(stream_cache_size > 0) return STREAM_UNSUPPORTED; if(dvd_seek_to_time(stream, d->vts_file, *((double*)arg))) return 1; break; } } - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } @@ -794,7 +794,7 @@ if(!dvd) { m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } } else #endif /* SYS_DARWIN */ @@ -803,7 +803,7 @@ if(!dvd) { mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CantOpenDVD,dvd_device); m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } } @@ -818,7 +818,7 @@ mp_msg(MSGT_OPEN,MSGL_ERR, MSGTR_DVDnoVMG); DVDClose( dvd ); m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } tt_srpt = vmg_file->tt_srpt; if (mp_msg_test(MSGT_IDENTIFY, MSGL_INFO)) @@ -855,7 +855,7 @@ ifoClose( vmg_file ); DVDClose( dvd ); m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DVD_CURRENT_TITLE=%d\n", dvd_title); --dvd_title; // remap 1.. -> 0.. @@ -1061,7 +1061,7 @@ //assign cell_times_table d->cell_times_table = malloc(sizeof(unsigned int) * d->cur_pgc->nr_of_cells); if(d->cell_times_table == NULL) - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; for(k=0; k<d->cur_pgc->nr_of_cells; k++) d->cell_times_table[k] = mp_dvdtimetomsec(&d->cur_pgc->cell_playback[k].playback_time); list_chapters(d->cur_pgc); @@ -1086,11 +1086,11 @@ ifoClose(vmg_file); DVDClose(dvd); m_struct_free(&stream_opts, opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } mp_msg(MSGT_DVD,MSGL_ERR,MSGTR_NoDVDSupport); m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; }
--- a/stream/stream_dvdnav.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_dvdnav.c Tue Aug 28 22:38:45 2007 +0000 @@ -348,7 +348,7 @@ #endif } - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { @@ -361,18 +361,18 @@ else filename = DEFAULT_DVD_DEVICE; if(!(priv=new_dvdnav_stream(filename))) { mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CantOpenDVD,filename); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } if(p->track > 0) { if(dvd_chapter > 0 && dvd_last_chapter > 0 && dvd_chapter > dvd_last_chapter) { mp_msg(MSGT_OPEN,MSGL_FATAL,"dvdnav_stream, invalid chapter range: %d > %d\n", dvd_chapter, dvd_last_chapter); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } priv->title = p->track; if(dvdnav_title_play(priv->dvdnav, p->track) != DVDNAV_STATUS_OK) { mp_msg(MSGT_OPEN,MSGL_FATAL,"dvdnav_stream, couldn't select title %d, error '%s'\n", p->track, dvdnav_err_to_string(priv->dvdnav)); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } if(dvd_chapter > 0) dvdnav_part_play(priv->dvdnav, p->track, dvd_chapter);
--- a/stream/stream_file.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_file.c Tue Aug 28 22:38:45 2007 +0000 @@ -81,7 +81,7 @@ } } } - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } static int open_f(stream_t *stream,int mode, void* opts, int* file_format) { @@ -98,7 +98,7 @@ else { mp_msg(MSGT_OPEN,MSGL_ERR, "[file] Unknown open mode %d\n",mode); m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } if(p->filename)
--- a/stream/stream_ftp.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_ftp.c Tue Aug 28 22:38:45 2007 +0000 @@ -376,7 +376,7 @@ if(mode != STREAM_READ) { mp_msg(MSGT_OPEN,MSGL_ERR, "[ftp] Unknown open mode %d\n",mode); m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } if(!p->filename || !p->host) {
--- a/stream/stream_livedotcom.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_livedotcom.c Tue Aug 28 22:38:45 2007 +0000 @@ -92,7 +92,7 @@ *file_format = DEMUXER_TYPE_RTP; return STREAM_OK; } - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; }
--- a/stream/stream_netstream.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_netstream.c Tue Aug 28 22:38:45 2007 +0000 @@ -219,7 +219,7 @@ case STREAM_CTRL_RESET: return net_stream_reset(s); } - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } static void close_s(struct stream_st *s) { @@ -237,7 +237,7 @@ mp_net_stream_opened_t* opened; if(mode != STREAM_READ) - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; if(!p->host) { mp_msg(MSGT_OPEN,MSGL_ERR, "We need an host name (ex: mpst://server.net/cdda://5)\n");
--- a/stream/stream_pvr.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_pvr.c Tue Aug 28 22:38:45 2007 +0000 @@ -1573,7 +1573,7 @@ struct pvr_t *pvr = NULL; if (mode != STREAM_READ) - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; pvr = pvr_init ();
--- a/stream/stream_radio.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_radio.c Tue Aug 28 22:38:45 2007 +0000 @@ -1099,10 +1099,10 @@ int i; if (strncmp("radio://",stream->url,8) != 0) - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; if(mode != STREAM_READ) - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; priv=calloc(1,sizeof(radio_priv_t));
--- a/stream/stream_rtp.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_rtp.c Tue Aug 28 22:38:45 2007 +0000 @@ -85,7 +85,7 @@ streaming_ctrl_free (stream->streaming_ctrl); stream->streaming_ctrl = NULL; - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } if (rtp_streaming_start (stream) < 0) @@ -94,7 +94,7 @@ streaming_ctrl_free (stream->streaming_ctrl); stream->streaming_ctrl = NULL; - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } stream->type = STREAMTYPE_STREAM;
--- a/stream/stream_rtsp.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_rtsp.c Tue Aug 28 22:38:45 2007 +0000 @@ -157,7 +157,7 @@ { streaming_ctrl_free (stream->streaming_ctrl); stream->streaming_ctrl = NULL; - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } fixup_network_stream_cache (stream);
--- a/stream/stream_smb.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_smb.c Tue Aug 28 22:38:45 2007 +0000 @@ -66,7 +66,7 @@ } } } - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } static int seek(stream_t *s,off_t newpos) { @@ -108,7 +108,7 @@ else { mp_msg(MSGT_OPEN, MSGL_ERR, "[smb] Unknown open mode %d\n", mode); m_struct_free (&stream_opts, opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } if(!filename) {
--- a/stream/stream_udp.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_udp.c Tue Aug 28 22:38:45 2007 +0000 @@ -77,7 +77,7 @@ streaming_ctrl_free (stream->streaming_ctrl); stream->streaming_ctrl = NULL; - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } if (udp_streaming_start (stream) < 0) @@ -86,7 +86,7 @@ streaming_ctrl_free (stream->streaming_ctrl); stream->streaming_ctrl = NULL; - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } stream->type = STREAMTYPE_STREAM;
--- a/stream/stream_vcd.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_vcd.c Tue Aug 28 22:38:45 2007 +0000 @@ -92,7 +92,7 @@ #endif ) { m_struct_free(&stream_opts,opts); - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } if (!p->device) {
--- a/stream/stream_vstream.c Tue Aug 28 19:58:45 2007 +0000 +++ b/stream/stream_vstream.c Tue Aug 28 22:38:45 2007 +0000 @@ -98,7 +98,7 @@ } static int control(struct stream_st *s,int cmd,void* arg) { - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; } static void close_s(struct stream_st *s) { @@ -109,7 +109,7 @@ struct stream_priv_s* p = (struct stream_priv_s*)opts; if(mode != STREAM_READ) - return STREAM_UNSUPORTED; + return STREAM_UNSUPPORTED; if(!p->host) { mp_msg(MSGT_OPEN, MSGL_ERR, "We need a host name (ex: tivo://hostname/fsid)\n");