[MPlayer-dev-eng] [PATCH] replacement for internal mpg123 fork (mp3lib), Final version?

[Thomas Orgis]

Am Mon, 24 May 2010 16:58:55 +0200
schrieb Dominik 'Rathann' Mierzejewski <dominik at rangers.eu.org>: 

> > +  bad_end:
> > +    if (!con->handle)
> > +        mp_msg(MSGT_DECAUDIO, MSGL_ERR, "mpg123 preinit error: %s\n",
> > +               mpg123_plain_strerror(err));
> > +    else
> > +        mp_msg(MSGT_DECAUDIO, MSGL_ERR, "mpg123 preinit error: %s\n",
> > +               mpg123_strerror(con->handle));
> > +
> > +    if (con->handle)
> > +        mpg123_delete(con->handle);
> 
> This if() can be merged with the else above.

Hm, or what about that:

bad_end:
  mp_msg(MSGT_DECAUDIO, MSGL_ERR, "mpg123 preinit error: %s\n",
             con->handle ? mpg123_strerror(con->handle) : mpg123_plain_strerror(err));

  if (con->handle)
      mpg123_delete(con->handle);



Alrighty then,

Thomas.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20100525/6114132f/attachment.pgp>