comparison subreader.c @ 9143:6af323788366

maybe fix ogm vs. iconv

9142:a540a2632da1

void	subcp_close (void)
{
	if (icdsc != (iconv_t)(-1)){
		(void) iconv_close (icdsc);
		sub_utf8=sub_utf8_prev;
	   	mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: closed iconv descriptor.\n");
	}
}

// for demux_ogg.c:
subtitle* subcp_recode1 (subtitle *sub)
{
  int l=sub->lines;
  size_t ileft, oleft;
  char *op, *ip;

  while (l){
     ip = icbuffer;
     op = sub->text[--l];
     strcpy(ip, op);
     ileft = strlen(ip);
     oleft = ICBUFFSIZE - 1;
		
     if (iconv(icdsc, &ip, &ileft,
	      &op, &oleft) == (size_t)(-1)) {
	mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error recoding line (2).\n");
	return sub;
     }
     *op='\0' ;
  }
  return sub;

9143:6af323788366

void	subcp_close (void)
{
	if (icdsc != (iconv_t)(-1)){
		(void) iconv_close (icdsc);
		icdsc = (iconv_t)(-1);
		sub_utf8=sub_utf8_prev;
	   	mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: closed iconv descriptor.\n");
	}
}

// for demux_ogg.c:
subtitle* subcp_recode1 (subtitle *sub)
{
  int l=sub->lines;
  size_t ileft, oleft;
  
  if(icdsc == (iconv_t)(-1)) return sub;

  while (l){
     char *ip = icbuffer;
     char *op = sub->text[--l];
     strcpy(ip, op);
     ileft = strlen(ip);
     oleft = ICBUFFSIZE - 1;
		
     if (iconv(icdsc, &ip, &ileft,
	      &op, &oleft) == (size_t)(-1)) {
	mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: error recoding line (2).\n");
	return sub;
     }
     *op='\0' ;
  }
  return sub;