Gentoo Attachment #100698 for bug #152496

View | Details | Raw Unified
Collapse All | Expand All

(-) ogmrip-0.10.0/src/ogmrip-main.c (-120 / +205 lines)

Lines 21-26	Link Here

#include "ogmrip-fs.h"

#include "ogmrip-fs.h"

#include "ogmrip-xvid.h"

#include "ogmrip-xvid.h"

#include "ogmrip-backend.h"

#include "ogmrip-backend.h"

#include "ogmrip-version.h"

#include "ogmjob-enums.h"

#include "ogmjob-enums.h"

#include "ogmjob-exec.h"

#include "ogmjob-exec.h"

Lines 67-75	Link Here

  gchar **argv;

  gchar **argv;

  gint result;

  gint result;

#if MPLAYER_PRE < 8

#if !MPLAYER_CHECK_VERSION(1,0,0,8)

  gchar *cwd;

  gchar *cwd;

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION */

  argv = ogmrip_backend_xvid_command (OGMRIP_VIDEO (spawn), NULL, NULL, NULL);

  argv = ogmrip_backend_xvid_command (OGMRIP_VIDEO (spawn), NULL, NULL, NULL);

  if (!argv)

  if (!argv)

Lines 80-102	Link Here

  ogmjob_container_add (OGMJOB_CONTAINER (spawn), child);

  ogmjob_container_add (OGMJOB_CONTAINER (spawn), child);

  g_object_unref (child);

  g_object_unref (child);

#if MPLAYER_PRE < 8

#if !MPLAYER_CHECK_VERSION(1,0,0,8)

/*

/*

   * Workaround against xvid pass log file

   * Workaround against xvid pass log file

*/

*/

  cwd = g_get_current_dir ();

  cwd = g_get_current_dir ();

  g_chdir (g_get_tmp_dir ());

  g_chdir (g_get_tmp_dir ());

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION */

  result = OGMJOB_SPAWN_CLASS (ogmrip_xvid_parent_class)->run (spawn);

  result = OGMJOB_SPAWN_CLASS (ogmrip_xvid_parent_class)->run (spawn);

#if MPLAYER_PRE < 8

#if !MPLAYER_CHECK_VERSION(1,0,0,8)

/*

/*

   * Return in cwd

   * Return in cwd

*/

*/

  g_chdir (cwd);

  g_chdir (cwd);

  g_free (cwd);

  g_free (cwd);

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION */

  ogmjob_container_remove (OGMJOB_CONTAINER (spawn), child);

  ogmjob_container_remove (OGMJOB_CONTAINER (spawn), child);

Lines 19-24	Link Here

#include "config.h"

#include "config.h"

#include "ogmrip-backend.h"

#include "ogmrip-backend.h"

#include "ogmrip-version.h"

#include "ogmrip-lavc.h"

#include "ogmrip-lavc.h"

#include "ogmrip-xvid.h"

#include "ogmrip-xvid.h"

#include "ogmrip-avi.h"

#include "ogmrip-avi.h"

Lines 55-65	Link Here

#define OGMRIP_X264_HIGH_OPTIONS      "subq=5:b_pyramid:weight_b:frameref=2"

#define OGMRIP_X264_HIGH_OPTIONS      "subq=5:b_pyramid:weight_b:frameref=2"

#define OGMRIP_X264_FAST_OPTIONS      "subq=4:b_pyramid:weight_b"

#define OGMRIP_X264_FAST_OPTIONS      "subq=4:b_pyramid:weight_b"

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

#define CROP_FRAMES 12

#define CROP_FRAMES 12

#else

#else

#define CROP_FRAMES 30

#define CROP_FRAMES 30

#endif

#endif /* MPLAYER_CHECK_VERSION */

static const gchar *deinterlacer[] = { "pp=lb", "pp=li", "pp=ci", "pp=md", "pp=fd", "kerndeint" };

static const gchar *deinterlacer[] = { "pp=lb", "pp=li", "pp=ci", "pp=md", "pp=fd", "kerndeint" };

Lines 427-435	Link Here

  guint start, end;

  guint start, end;

  gint vid, aid;

  gint vid, aid;

#if MPLAYER_PRE >= 6

#if MPLAYER_CHECK_VERSION(1,0,0,6)

  gint srate;

  gint srate;

#endif

#endif /* MPLAYER_CHECK_VERSION */

  g_return_val_if_fail (OGMRIP_IS_AUDIO (audio), NULL);

  g_return_val_if_fail (OGMRIP_IS_AUDIO (audio), NULL);

Lines 457-473	Link Here

  g_ptr_array_add (argv, g_strdup ("null"));

  g_ptr_array_add (argv, g_strdup ("null"));

  g_ptr_array_add (argv, g_strdup ("-ao"));

  g_ptr_array_add (argv, g_strdup ("-ao"));

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  if (header)

  if (header)

    g_ptr_array_add (argv, g_strdup_printf ("pcm:fast:waveheader:file=%s", output));

    g_ptr_array_add (argv, g_strdup_printf ("pcm:fast:waveheader:file=%s", output));

  else

  else

    g_ptr_array_add (argv, g_strdup_printf ("pcm:fast:nowaveheader:file=%s", output));

    g_ptr_array_add (argv, g_strdup_printf ("pcm:fast:nowaveheader:file=%s", output));

#elif MPLAYER_PRE >= 7

#elif MPLAYER_CHECK_VERSION(1,0,0,7)

  if (header)

  if (header)

    g_ptr_array_add (argv, g_strdup_printf ("pcm:waveheader:file=%s", output));

    g_ptr_array_add (argv, g_strdup_printf ("pcm:waveheader:file=%s", output));

  else

  else

    g_ptr_array_add (argv, g_strdup_printf ("pcm:nowaveheader:file=%s", output));

    g_ptr_array_add (argv, g_strdup_printf ("pcm:nowaveheader:file=%s", output));

#else /* MPLAYER_PRE < 7 */

#else /* MPLAYER_CHECK_VERSION(1,0,0,7) 7 */

  g_ptr_array_add (argv, g_strdup ("pcm"));

  g_ptr_array_add (argv, g_strdup ("pcm"));

  if (header)

  if (header)

    g_ptr_array_add (argv, g_strdup ("-waveheader"));

    g_ptr_array_add (argv, g_strdup ("-waveheader"));

Lines 475-496	Link Here

    g_ptr_array_add (argv, g_strdup ("-nowaveheader"));

    g_ptr_array_add (argv, g_strdup ("-nowaveheader"));

  g_ptr_array_add (argv, g_strdup ("-aofile"));

  g_ptr_array_add (argv, g_strdup ("-aofile"));

  g_ptr_array_add (argv, g_strdup (output));

  g_ptr_array_add (argv, g_strdup (output));

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  options = g_string_new (NULL);

  options = g_string_new (NULL);

  if (ogmrip_audio_get_normalize (audio))

  if (ogmrip_audio_get_normalize (audio))

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

    g_string_append (options, "volnorm=1");

    g_string_append (options, "volnorm=1");

#elif MPLAYER_PRE >= 6

#elif MPLAYER_CHECK_VERSION(1,0,0,6)

    g_string_append (options, "volnorm");

    g_string_append (options, "volnorm");

#else /* MPLAYER_PRE */

#else /* MPLAYER_CHECK_VERSION(1,0,0,6) */

    g_string_append (options, "list=volnorm");

    g_string_append (options, "list=volnorm");

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

#if MPLAYER_PRE >= 6

#if MPLAYER_CHECK_VERSION(1,0,0,6)

  srate = ogmrip_audio_get_sample_rate (audio);

  srate = ogmrip_audio_get_sample_rate (audio);

  if (srate != 48000)

  if (srate != 48000)

Lines 498-514	Link Here

      g_string_append_c (options, ',');

      g_string_append_c (options, ',');

    g_string_append_printf (options, "lavcresample=%d", srate);

    g_string_append_printf (options, "lavcresample=%d", srate);

#endif

#endif /* MPLAYER_CHECK_VERSION(1,0,0,6) */

  if (options->len == 0)

  if (options->len == 0)

    g_string_free (options, TRUE);

    g_string_free (options, TRUE);

  else

  else

#if MPLAYER_PRE >= 6

#if MPLAYER_CHECK_VERSION(1,0,0,6)

    g_ptr_array_add (argv, g_strdup ("-af"));

    g_ptr_array_add (argv, g_strdup ("-af"));

#else

#else /* MPLAYER_CHECK_VERSION(1,0,0,6) */

    g_ptr_array_add (argv, g_strdup ("-aop"));

    g_ptr_array_add (argv, g_strdup ("-aop"));

#endif

#endif /* MPLAYER_CHECK_VERSION(1,0,0,6) */

    g_ptr_array_add (argv, g_string_free (options, FALSE));

    g_ptr_array_add (argv, g_string_free (options, FALSE));

Lines 529-540	Link Here

  vid = ogmdvd_title_get_nr (title);

  vid = ogmdvd_title_get_nr (title);

#if MPLAYER_MAJOR > 0

#if MPLAYER_CHECK_VERSION(1,0,0,1)

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

#else /* MPLAYER_MAJOR */

#else /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

#endif /* MPLAYER_MAJOR */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, NULL);

  g_ptr_array_add (argv, NULL);

Lines 573-585	Link Here

  g_ptr_array_add (argv, g_strdup ("0"));

  g_ptr_array_add (argv, g_strdup ("0"));

  g_ptr_array_add (argv, g_strdup ("-ovc"));

  g_ptr_array_add (argv, g_strdup ("-ovc"));

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  g_ptr_array_add (argv, g_strdup ("copy"));

  g_ptr_array_add (argv, g_strdup ("copy"));

  g_ptr_array_add (argv, g_strdup ("-of"));

  g_ptr_array_add (argv, g_strdup ("-of"));

  g_ptr_array_add (argv, g_strdup ("rawaudio"));

  g_ptr_array_add (argv, g_strdup ("rawaudio"));

#else /* MPLAYER_PRE */

#else /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  g_ptr_array_add (argv, g_strdup ("frameno"));

  g_ptr_array_add (argv, g_strdup ("frameno"));

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  g_ptr_array_add (argv, g_strdup ("-oac"));

  g_ptr_array_add (argv, g_strdup ("-oac"));

  g_ptr_array_add (argv, g_strdup ("copy"));

  g_ptr_array_add (argv, g_strdup ("copy"));

Lines 608-619	Link Here

  vid = ogmdvd_title_get_nr (title);

  vid = ogmdvd_title_get_nr (title);

#if MPLAYER_MAJOR > 0

#if MPLAYER_CHECK_VERSION(1,0,0,1)

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

#else /* MPLAYER_MAJOR */

#else /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

#endif /* MPLAYER_MAJOR */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, NULL);

  g_ptr_array_add (argv, NULL);

Lines 902-911	Link Here

      break;

      break;

#if MPLAYER_PRE >= 6

#if MPLAYER_CHECK_VERSION(1,0,0,6)

  if (ogmrip_video_get_cartoon (video))

  if (ogmrip_video_get_cartoon (video))

    g_string_append (options, ":cartoon");

    g_string_append (options, ":cartoon");

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,6) */

  if (ogmrip_video_get_qpel (video))

  if (ogmrip_video_get_qpel (video))

    g_string_append (options, ":qpel");

    g_string_append (options, ":qpel");

Lines 962-973	Link Here

  vid = ogmdvd_title_get_nr (title);

  vid = ogmdvd_title_get_nr (title);

#if MPLAYER_MAJOR > 0

#if MPLAYER_CHECK_VERSION(1,0,0,1)

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

#else /* MPLAYER_MAJOR */

#else /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

#endif /* MPLAYER_MAJOR */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, NULL);

  g_ptr_array_add (argv, NULL);

Lines 1017-1026	Link Here

      break;

      break;

#if MPLAYER_PRE >= 6

#if MPLAYER_CHECK_VERSION(1,0,0,6)

  if (ogmrip_video_get_turbo (video))

  if (ogmrip_video_get_turbo (video))

    g_string_append (options, ":turbo");

    g_string_append (options, ":turbo");

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,6) */

  if (ogmrip_video_get_qpel (video))

  if (ogmrip_video_get_qpel (video))

    g_string_append (options, ":qpel");

    g_string_append (options, ":qpel");

Lines 1078-1089	Link Here

  vid = ogmdvd_title_get_nr (title);

  vid = ogmdvd_title_get_nr (title);

#if MPLAYER_MAJOR > 0

#if MPLAYER_CHECK_VERSION(1,0,0,1)

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

#else /* MPLAYER_MAJOR */

#else /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

#endif /* MPLAYER_MAJOR */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, NULL);

  g_ptr_array_add (argv, NULL);

Lines 1134-1143	Link Here

      break;

      break;

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  if (ogmrip_video_get_turbo (video))

  if (ogmrip_video_get_turbo (video))

    g_string_append (options, ":turbo=1");

    g_string_append (options, ":turbo=1");

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  if (ogmrip_video_get_4mv (video))

  if (ogmrip_video_get_4mv (video))

    g_string_append (options, ":4x4mv");

    g_string_append (options, ":4x4mv");

Lines 1186-1197	Link Here

  vid = ogmdvd_title_get_nr (title);

  vid = ogmdvd_title_get_nr (title);

#if MPLAYER_MAJOR > 0

#if MPLAYER_CHECK_VERSION(1,0,0,1)

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

#else /* MPLAYER_MAJOR */

#else /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

#endif /* MPLAYER_MAJOR */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, NULL);

  g_ptr_array_add (argv, NULL);

Lines 1308-1318	Link Here

  g_ptr_array_add (argv, g_strdup_printf ("%d", ogmrip_video_get_angle (video)));

  g_ptr_array_add (argv, g_strdup_printf ("%d", ogmrip_video_get_angle (video)));

  g_ptr_array_add (argv, g_strdup ("-vo"));

  g_ptr_array_add (argv, g_strdup ("-vo"));

#if MPLAYER_PRE >= 6

#if MPLAYER_CHECK_VERSION(1,0,0,6)

  g_ptr_array_add (argv, g_strdup_printf ("yuv4mpeg:file=%s", output));

  g_ptr_array_add (argv, g_strdup_printf ("yuv4mpeg:file=%s", output));

#else /* MPLAYER_PRE */

#else /* MPLAYER_CHECK_VERSION(1,0,0,6) */

  g_ptr_array_add (argv, g_strdup ("yuv4mpeg"));

  g_ptr_array_add (argv, g_strdup ("yuv4mpeg"));

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,6) */

  ogmrip_codec_get_chapters (OGMRIP_CODEC (video), &start, &end);

  ogmrip_codec_get_chapters (OGMRIP_CODEC (video), &start, &end);

  g_ptr_array_add (argv, g_strdup ("-chapter"));

  g_ptr_array_add (argv, g_strdup ("-chapter"));

Lines 1324-1335	Link Here

  vid = ogmdvd_title_get_nr (title);

  vid = ogmdvd_title_get_nr (title);

#if MPLAYER_MAJOR > 0

#if MPLAYER_CHECK_VERSION(1,0,0,1)

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

#else /* MPLAYER_MAJOR */

#else /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

#endif /* MPLAYER_MAJOR */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, NULL);

  g_ptr_array_add (argv, NULL);

Lines 1379-1387	Link Here

  const gchar *device;

  const gchar *device;

  gint vid;

  gint vid;

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  gint sstep;

  gint sstep;

#endif

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL);

  g_return_val_if_fail (OGMRIP_IS_VIDEO (video), NULL);

Lines 1390-1407	Link Here

  argv = g_ptr_array_new ();

  argv = g_ptr_array_new ();

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  g_ptr_array_add (argv, g_strdup ("mplayer"));

  g_ptr_array_add (argv, g_strdup ("mplayer"));

  g_ptr_array_add (argv, g_strdup ("-nolirc"));

  g_ptr_array_add (argv, g_strdup ("-nolirc"));

  g_ptr_array_add (argv, g_strdup ("-vo"));

  g_ptr_array_add (argv, g_strdup ("-vo"));

  g_ptr_array_add (argv, g_strdup ("null"));

  g_ptr_array_add (argv, g_strdup ("null"));

#else

#else /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  g_ptr_array_add (argv, g_strdup ("mencoder"));

  g_ptr_array_add (argv, g_strdup ("mencoder"));

  g_ptr_array_add (argv, g_strdup ("-ovc"));

  g_ptr_array_add (argv, g_strdup ("-ovc"));

  g_ptr_array_add (argv, g_strdup ("lavc"));

  g_ptr_array_add (argv, g_strdup ("lavc"));

  g_ptr_array_add (argv, g_strdup ("-o"));

  g_ptr_array_add (argv, g_strdup ("-o"));

  g_ptr_array_add (argv, g_strdup ("/dev/null"));

  g_ptr_array_add (argv, g_strdup ("/dev/null"));

#endif

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  g_ptr_array_add (argv, g_strdup ("-nosound"));

  g_ptr_array_add (argv, g_strdup ("-nosound"));

  g_ptr_array_add (argv, g_strdup ("-nocache"));

  g_ptr_array_add (argv, g_strdup ("-nocache"));

Lines 1411-1425	Link Here

  ogmrip_codec_get_length (OGMRIP_CODEC (video), &time_);

  ogmrip_codec_get_length (OGMRIP_CODEC (video), &time_);

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  sstep = (time_.hour * 3600 + time_.min * 60 + time_.sec) / (3 * CROP_FRAMES) + 1;

  sstep = (time_.hour * 3600 + time_.min * 60 + time_.sec) / (3 * CROP_FRAMES) + 1;

  g_ptr_array_add (argv, g_strdup ("-sstep"));

  g_ptr_array_add (argv, g_strdup ("-sstep"));

  g_ptr_array_add (argv, g_strdup_printf ("%d", sstep));

  g_ptr_array_add (argv, g_strdup_printf ("%d", sstep));

#else

#else /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  g_ptr_array_add (argv, g_strdup ("-ss"));

  g_ptr_array_add (argv, g_strdup ("-ss"));

  g_ptr_array_add (argv, g_strdup_printf ("%02u:%02u:%02u",

  g_ptr_array_add (argv, g_strdup_printf ("%02u:%02u:%02u",

        time_.hour / 4, time_.min / 4 + (time_.hour % 4) * 15, time_.sec / 4 + (time_.min % 4) * 15));

        time_.hour / 4, time_.min / 4 + (time_.hour % 4) * 15, time_.sec / 4 + (time_.min % 4) * 15));

#endif

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  g_ptr_array_add (argv, g_strdup ("-frames"));

  g_ptr_array_add (argv, g_strdup ("-frames"));

  g_ptr_array_add (argv, g_strdup_printf ("%d", CROP_FRAMES));

  g_ptr_array_add (argv, g_strdup_printf ("%d", CROP_FRAMES));

Lines 1430-1441	Link Here

  vid = ogmdvd_title_get_nr (title);

  vid = ogmdvd_title_get_nr (title);

#if MPLAYER_MAJOR > 0

#if MPLAYER_CHECK_VERSION(1,0,0,1)

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

#else /* MPLAYER_MAJOR */

#else /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

#endif /* MPLAYER_MAJOR */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, NULL);

  g_ptr_array_add (argv, NULL);

Lines 1601-1610	Link Here

      g_ptr_array_add (argv, g_strdup ("--language"));

      g_ptr_array_add (argv, g_strdup ("--language"));

      g_ptr_array_add (argv, g_strconcat ("0:", iso639_2, NULL));

      g_ptr_array_add (argv, g_strconcat ("0:", iso639_2, NULL));

#if MPLAYER_PRE < 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

      g_ptr_array_add (argv, g_strdup ("--language"));

      g_ptr_array_add (argv, g_strdup ("--language"));

      g_ptr_array_add (argv, g_strconcat ("1:", iso639_2, NULL));

      g_ptr_array_add (argv, g_strconcat ("1:", iso639_2, NULL));

#endif

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

Lines 1752-1758	Link Here

  input = ogmrip_codec_get_output (codec);

  input = ogmrip_codec_get_output (codec);

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  g_ptr_array_add (argv, g_strdup ("-audiofile"));

  g_ptr_array_add (argv, g_strdup ("-audiofile"));

  g_ptr_array_add (argv, g_strdup (input));

  g_ptr_array_add (argv, g_strdup (input));

Lines 1763-1769	Link Here

    g_ptr_array_add (argv, g_strdup ("-rawaudio"));

    g_ptr_array_add (argv, g_strdup ("-rawaudio"));

    g_ptr_array_add (argv, g_strdup_printf ("format=0x%x", demuxer));

    g_ptr_array_add (argv, g_strdup_printf ("format=0x%x", demuxer));

#else

#else /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  if (demuxer == OGMRIP_AUDIO_DEMUXER_AUTO)

  if (demuxer == OGMRIP_AUDIO_DEMUXER_AUTO)

    g_ptr_array_add (argv, g_strdup ("-audiofile"));

    g_ptr_array_add (argv, g_strdup ("-audiofile"));

Lines 1778-1784	Link Here

    g_rename (input, new_name);

    g_rename (input, new_name);

    strcpy ((gchar *) input, new_name);

    strcpy ((gchar *) input, new_name);

#endif

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

#ifdef HAVE_AAC_SUPPORT

#ifdef HAVE_AAC_SUPPORT

/*

/*

Lines 1801-1809	Link Here

  GPtrArray *argv;

  GPtrArray *argv;

  const gchar *fourcc;

  const gchar *fourcc;

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  const gchar *label;

  const gchar *label;

#endif

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  argv = g_ptr_array_new ();

  argv = g_ptr_array_new ();

  g_ptr_array_add (argv, g_strdup ("mencoder"));

  g_ptr_array_add (argv, g_strdup ("mencoder"));

Lines 1826-1839	Link Here

    g_ptr_array_add (argv, g_strdup (fourcc));

    g_ptr_array_add (argv, g_strdup (fourcc));

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  label = ogmrip_container_get_label (container);

  label = ogmrip_container_get_label (container);

  if (label)

  if (label)

    g_ptr_array_add (argv, g_strdup ("-info"));

    g_ptr_array_add (argv, g_strdup ("-info"));

    g_ptr_array_add (argv, g_strdup_printf ("name=%s", label));

    g_ptr_array_add (argv, g_strdup_printf ("name=%s", label));

#endif

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  return argv;

  return argv;

Lines 1928-1937	Link Here

  g_ptr_array_add (argv, g_strdup ("-nocache"));

  g_ptr_array_add (argv, g_strdup ("-nocache"));

  g_ptr_array_add (argv, g_strdup ("-nosound"));

  g_ptr_array_add (argv, g_strdup ("-nosound"));

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  g_ptr_array_add (argv, g_strdup ("-of"));

  g_ptr_array_add (argv, g_strdup ("-of"));

  g_ptr_array_add (argv, g_strdup ("rawaudio"));

  g_ptr_array_add (argv, g_strdup ("rawaudio"));

#endif

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  g_ptr_array_add (argv, g_strdup ("-ovc"));

  g_ptr_array_add (argv, g_strdup ("-ovc"));

  g_ptr_array_add (argv, g_strdup ("copy"));

  g_ptr_array_add (argv, g_strdup ("copy"));

Lines 1967-1978	Link Here

  vid = ogmdvd_title_get_nr (title);

  vid = ogmdvd_title_get_nr (title);

#if MPLAYER_MAJOR > 0

#if MPLAYER_CHECK_VERSION(1,0,0,1)

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

#else /* MPLAYER_MAJOR */

#else /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

#endif /* MPLAYER_MAJOR */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,1) */

  g_ptr_array_add (argv, NULL);

  g_ptr_array_add (argv, NULL);

Lines 6-12	Link Here

  ogmrip-audio.c      \

  ogmrip-audio.c      \

  ogmrip-avi.c        \

  ogmrip-avi.c        \

  ogmrip-backend.c    \

  ogmrip-backend.c    \

	ogmrip-chapters.c   \

  ogmrip-chapters.c   \

  ogmrip-codec.c      \

  ogmrip-codec.c      \

  ogmrip-container.c  \

  ogmrip-container.c  \

  ogmrip-dvdcpy.c     \

  ogmrip-dvdcpy.c     \

Lines 27-33	Link Here

  ogmrip-acopy.h      \

  ogmrip-acopy.h      \

  ogmrip-audio.h      \

  ogmrip-audio.h      \

  ogmrip-avi.h        \

  ogmrip-avi.h        \

	ogmrip-chapters.h   \

  ogmrip-chapters.h   \

  ogmrip-codec.h      \

  ogmrip-codec.h      \

  ogmrip-container.h  \

  ogmrip-container.h  \

  ogmrip-dvdcpy.h     \

  ogmrip-dvdcpy.h     \

Lines 35-40	Link Here

  ogmrip-mp3.h        \

  ogmrip-mp3.h        \

  ogmrip-ogg.h        \

  ogmrip-ogg.h        \

  ogmrip-subp.h       \

  ogmrip-subp.h       \

  ogmrip-version.h    \

  ogmrip-video.h      \

  ogmrip-video.h      \

  ogmrip-vobsub.h     \

  ogmrip-vobsub.h     \

  ogmrip-vorbis.h     \

  ogmrip-vorbis.h     \

Lines 98-104	Link Here

  -version-info $(OGMRIP_LT_VERSION)

  -version-info $(OGMRIP_LT_VERSION)

EXTRA_DIST = \

EXTRA_DIST = \

  ogmrip-backend.h \

  ogmrip-backend.h    \

  ogmrip-version.h.in \

  ogmrip-xml.h

  ogmrip-xml.h

if MAINTAINER_MODE

if MAINTAINER_MODE

Lines 113-121	Link Here

  -I$(top_srcdir)/libogmdvd \

  -I$(top_srcdir)/libogmdvd \

  -DOGMRIP_DATA_DIR=\""$(datadir)"\"

  -DOGMRIP_DATA_DIR=\""$(datadir)"\"

ogmripincdir = $(includedir)/ogmrip

ogmripincdir = \

ogmripinc_DATA = ogmrip.h

  $(includedir)/ogmrip

ogmripinc_DATA = \

  ogmrip.h \

  ogmrip-version.h

DISTCLEANFILES = \

DISTCLEANFILES = \

	ogmrip.h

  ogmrip.h \

  ogmrip-version.h

Line 0	Link Here

#ifndef __OGMRIP_VERSION_H__

#define __OGMRIP_VERSION_H__

/*

 * Compile time version of OGMRip

*/

#define OGMRIP_MAJOR_VERSION       (@OGMRIP_MAJOR_VERSION@)

#define OGMRIP_MINOR_VERSION       (@OGMRIP_MINOR_VERSION@)

#define OGMRIP_MICRO_VERSION       (@OGMRIP_MICRO_VERSION@)

/*

 * Compile time version of MPlayer

*/

#define MPLAYER_MAJOR_VERSION      (@MPLAYER_MAJOR_VERSION@)

#define MPLAYER_MINOR_VERSION      (@MPLAYER_MINOR_VERSION@)

#define MPLAYER_PRE_VERSION        (@MPLAYER_PRE_VERSION@)

#define MPLAYER_RC_VERSION         (@MPLAYER_RC_VERSION@)

/*

 * Check if version if equal or greather than

 * major.minor.micro

*/

#define OGMRIP_CHECK_VERSION(major,minor,micro)  \

  ((OGMRIP_MAJOR_VERSION > (major)) || \

   (OGMRIP_MAJOR_VERSION == (major) && OGMRIP_MINOR_VERSION > (minor)) || \

   (OGMRIP_MAJOR_VERSION == (major) && OGMRIP_MINOR_VERSION == (minor) && OGMRIP_MICRO_VERSION >= (micro)))

/*

 * Check if version is equal or greather than

 * major.minor, major.minor-rc or major.minor-pre

 * in that order

*/

#define MPLAYER_CHECK_VERSION(major,minor,rc,pre) \

  ((MPLAYER_MAJOR_VERSION > (major)) || \

   (MPLAYER_MAJOR_VERSION == (major) && MPLAYER_MINOR_VERSION > (minor)) || \

   (MPLAYER_MAJOR_VERSION == (major) && MPLAYER_MINOR_VERSION == (minor) && \

    ((MPLAYER_RC_VERSION == 0 && MPLAYER_PRE_VERSION == 0) || \

     ((MPLAYER_RC_VERSION != 0 || MPLAYER_PRE_VERSION != 0) && ((rc) != 0 || (pre) != 0) && (MPLAYER_RC_VERSION > (rc))) || \

     ((MPLAYER_RC_VERSION != 0 || MPLAYER_PRE_VERSION != 0) && ((rc) != 0 || (pre) != 0) && MPLAYER_RC_VERSION == (rc) && MPLAYER_PRE_VERSION >= (pre)))))

#endif /* __OGMRIP_VERSION_H__ */

Lines 2-13	Link Here

AC_PREREQ(2.53)

AC_PREREQ(2.53)

AC_INIT(OGMRip, 0.10.0)

m4_define([ogmrip_major_version], [0])

m4_define([ogmrip_minor_version], [10])

m4_define([ogmrip_micro_version], [0])

m4_define([ogmrip_version], [ogmrip_major_version.ogmrip_minor_version.ogmrip_micro_version])

AC_INIT([OGMRip], [ogmrip_version])

AC_CONFIG_SRCDIR(src/ogmrip-main.c)

AC_CONFIG_SRCDIR(src/ogmrip-main.c)

AM_INIT_AUTOMAKE(ogmrip, AC_PACKAGE_VERSION)

AM_INIT_AUTOMAKE(ogmrip, AC_PACKAGE_VERSION)

AC_CONFIG_HEADERS(config.h)

AC_CONFIG_HEADERS(config.h)

dnl **************************************************************

OGMRIP_MAJOR_VERSION=ogmrip_major_version

OGMRIP_MINOR_VERSION=ogmrip_minor_version

OGMRIP_MICRO_VERSION=ogmrip_micro_version

OGMRIP_VERSION=ogmrip_version

AC_SUBST(OGMRIP_MAJOR_VERSION)

AC_SUBST(OGMRIP_MINOR_VERSION)

AC_SUBST(OGMRIP_MICRO_VERSION)

AC_SUBST(OGMRIP_VERSION)

dnl **************************************************************

AC_PROG_CC

AC_PROG_CC

AC_PROG_INSTALL

AC_PROG_INSTALL

AC_PROG_LIBTOOL

AC_PROG_LIBTOOL

Lines 163-184	Link Here

if $MPLAYER_PROG 2> /dev/null | grep -q "MPlayer dev-\(CVS\|SVN\)"; then

if $MPLAYER_PROG 2> /dev/null | grep -q "MPlayer dev-\(CVS\|SVN\)"; then

  have_mplayer_dev=yes

  have_mplayer_dev=yes

  AC_DEFINE_UNQUOTED(MPLAYER_MAJOR, 1, [Mplayer major version number])

  MPLAYER_MAJOR_VERSION=99

  AC_DEFINE_UNQUOTED(MPLAYER_PRE, 99, [Mplayer pre version number])

  MPLAYER_MINOR_VERSION=99

  MPLAYER_PRE_VERSION=99

  MPLAYER_RC_VERSION=99

  AC_MSG_WARN(Mplayer SVN/CVS detected - USE AT YOUR OWN RISK)

  AC_MSG_WARN(Mplayer SVN/CVS detected - USE AT YOUR OWN RISK)

else

else

  have_mplayer_dev=no

  have_mplayer_dev=no

  MPLAYER_MAJOR=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer \([[0-1]]\).*%\1%'`

  MPLAYER_MAJOR_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer \([[0-1]]\).*%\1%'`

  AC_DEFINE_UNQUOTED(MPLAYER_MAJOR, $MPLAYER_MAJOR, [Mplayer major version number])

  MPLAYER_MINOR_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.\([[0-9]]\).*%\1%'`

  MPLAYER_PRE_VERSION=0

  MPLAYER_RC_VERSION=0

  if $MPLAYER_PROG 2> /dev/null | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+pre[[0-9]]\+.*"; then

  if $MPLAYER_PROG 2> /dev/null | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+pre[[0-9]]\+.*"; then

    MPLAYER_PRE=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+pre\([[0-9]]\+\).*%\1%'`

    MPLAYER_PRE_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+pre\([[0-9]]\+\).*%\1%'`

    AC_DEFINE_UNQUOTED(MPLAYER_PRE, $MPLAYER_PRE, [Mplayer pre version number])

fi

  else

    AC_DEFINE_UNQUOTED(MPLAYER_PRE, 0, [Mplayer pre version number])

  if $MPLAYER_PROG 2> /dev/null | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+rc[[0-9]]\+.*"; then

    MPLAYER_RC_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+rc\([[0-9]]\+\).*%\1%'`

fi

fi

fi

fi

AC_SUBST(MPLAYER_MAJOR_VERSION)

AC_SUBST(MPLAYER_MINOR_VERSION)

AC_SUBST(MPLAYER_PRE_VERSION)

AC_SUBST(MPLAYER_RC_VERSION)

dnl **************************************************************

dnl **************************************************************

AC_PATH_PROG(MENCODER_PROG, mencoder)

AC_PATH_PROG(MENCODER_PROG, mencoder)

Lines 450-455	Link Here

#include <ogmrip-lavc.h>

#include <ogmrip-lavc.h>

#include <ogmrip-mp3.h>

#include <ogmrip-mp3.h>

#include <ogmrip-ogg.h>

#include <ogmrip-ogg.h>

#include <ogmrip-version.h>

#include <ogmrip-vobsub.h>

#include <ogmrip-vobsub.h>

#include <ogmrip-vorbis.h>

#include <ogmrip-vorbis.h>

#include <ogmrip-wav.h>

#include <ogmrip-wav.h>

Lines 565-570	Link Here

libogmdvd-gtk/Makefile

libogmdvd-gtk/Makefile

libogmjob/Makefile

libogmjob/Makefile

libogmrip/Makefile

libogmrip/Makefile

libogmrip/ogmrip-version.h

libbacon/Makefile

libbacon/Makefile

data/Makefile

data/Makefile

data/ogmdvd.pc

data/ogmdvd.pc

Lines 19-24	Link Here

#include "config.h"

#include "config.h"

#include "ogmdvd.h"

#include "ogmdvd.h"

#include "ogmrip.h"

#include "ogmrip-crop.h"

#include "ogmrip-crop.h"

#include "ogmrip-helper.h"

#include "ogmrip-helper.h"

Lines 104-128	Link Here

  g_ptr_array_add (argv, g_strdup ("-vo"));

  g_ptr_array_add (argv, g_strdup ("-vo"));

#if MPLAYER_PRE >= 6

#if MPLAYER_CHECK_VERSION(1,0,0,6)

  g_ptr_array_add (argv, g_strdup_printf ("jpeg:outdir=%s", ogmrip_fs_get_tmp_dir ()));

  g_ptr_array_add (argv, g_strdup_printf ("jpeg:outdir=%s", ogmrip_fs_get_tmp_dir ()));

#else /* MPLAYER_PRE */

#else /* MPLAYER_CHECK_VERSION(1,0,0,6) */

  g_ptr_array_add (argv, g_strdup ("jpeg"));

  g_ptr_array_add (argv, g_strdup ("jpeg"));

  g_ptr_array_add (argv, g_strdup ("-jpeg"));

  g_ptr_array_add (argv, g_strdup ("-jpeg"));

  g_ptr_array_add (argv, g_strdup_printf ("outdir=%s", ogmrip_fs_get_tmp_dir ()));

  g_ptr_array_add (argv, g_strdup_printf ("outdir=%s", ogmrip_fs_get_tmp_dir ()));

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,6) */

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  g_ptr_array_add (argv, g_strdup ("-vc"));

  g_ptr_array_add (argv, g_strdup ("-vc"));

  g_ptr_array_add (argv, g_strdup ("ffmpeg12"));

  g_ptr_array_add (argv, g_strdup ("ffmpeg12"));

  g_ptr_array_add (argv, g_strdup ("-frames"));

  g_ptr_array_add (argv, g_strdup ("-frames"));

  g_ptr_array_add (argv, g_strdup ("1"));

  g_ptr_array_add (argv, g_strdup ("1"));

#else /* MPLAYER_PRE */

#else /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  g_ptr_array_add (argv, g_strdup ("-frames"));

  g_ptr_array_add (argv, g_strdup ("-frames"));

  g_ptr_array_add (argv, g_strdup ("3"));

  g_ptr_array_add (argv, g_strdup ("3"));

  g_ptr_array_add (argv, g_strdup ("-sstep"));

  g_ptr_array_add (argv, g_strdup ("-sstep"));

  g_ptr_array_add (argv, g_strdup ("1"));

  g_ptr_array_add (argv, g_strdup ("1"));

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  chap = ogmrip_crop_get_chapter (data->title, &frame);

  chap = ogmrip_crop_get_chapter (data->title, &frame);

  g_ptr_array_add (argv, g_strdup ("-chapter"));

  g_ptr_array_add (argv, g_strdup ("-chapter"));

Lines 138-149	Link Here

  vid = ogmdvd_title_get_nr (data->title);

  vid = ogmdvd_title_get_nr (data->title);

#if MPLAYER_MAJOR > 0

#if MPLAYER_CHECK_VERSION(1,0,0,1)

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("dvd://%d", vid + 1));

#else /* MPLAYER_MAJOR */

#else /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup ("-dvd"));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

  g_ptr_array_add (argv, g_strdup_printf ("%d", vid + 1));

#endif /* MPLAYER_MAJOR */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  g_ptr_array_add (argv, NULL);

  g_ptr_array_add (argv, NULL);

Lines 182-190	Link Here

    gchar *filename;

    gchar *filename;

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

    filename = g_build_filename (ogmrip_fs_get_tmp_dir (), "00000001.jpg", NULL);

    filename = g_build_filename (ogmrip_fs_get_tmp_dir (), "00000001.jpg", NULL);

#else /* MPLAYER_PRE */

#else /* MPLAYER_CHECK_VERSION(1,0,0,8) */

    filename = g_build_filename (ogmrip_fs_get_tmp_dir (), "00000001.jpg", NULL);

    filename = g_build_filename (ogmrip_fs_get_tmp_dir (), "00000001.jpg", NULL);

    g_unlink (filename);

    g_unlink (filename);

    g_free (filename);

    g_free (filename);

Lines 194-200	Link Here

    g_free (filename);

    g_free (filename);

    filename = g_build_filename (ogmrip_fs_get_tmp_dir (), "00000002.jpg", NULL);

    filename = g_build_filename (ogmrip_fs_get_tmp_dir (), "00000002.jpg", NULL);

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

    if (g_file_test (filename, G_FILE_TEST_IS_REGULAR))

    if (g_file_test (filename, G_FILE_TEST_IS_REGULAR))

Lines 27-37	Link Here

#include "ogmrip-chapter-list.h"

#include "ogmrip-chapter-list.h"

#include "ogmrip-chooser-list.h"

#include "ogmrip-chooser-list.h"

#include <ogmdvd.h>

#include "ogmdvd.h"

#include <ogmdvd-gtk.h>

#include "ogmdvd-gtk.h"

#include <ogmjob.h>

#include "ogmjob.h"

#include <ogmrip.h>

#include "ogmrip.h"

#ifdef HAVE_ENCHANT_SUPPORT

#ifdef HAVE_ENCHANT_SUPPORT

#include "ogmrip-spell.h"

#include "ogmrip-spell.h"

Lines 206-221	Link Here

static gchar *

static gchar *

ogmrip_main_mklog (void)

ogmrip_main_mklog (void)

#if MPLAYER_PRE < 8

#if !MPLAYER_CHECK_VERSION(1,0,0,8)

  GConfClient *gconf;

  GConfClient *gconf;

  GType type;

  GType type;

  gint codec;

  gint codec;

#endif

#endif /* !MPLAYER_CHECK_VERSION(1,0,0,8) */

  gchar *filename;

  gchar *filename;

#if MPLAYER_PRE >= 8

#if MPLAYER_CHECK_VERSION(1,0,0,8)

  filename = ogmrip_fs_mktemp ("log.XXXXXX", NULL);

  filename = ogmrip_fs_mktemp ("log.XXXXXX", NULL);

#else /* MPLAYER_PRE < 8 */

#else /* MPLAYER_CHECK_VERSION(1,0,0,8) < 8 */

/*

/*

   * Workaround against xvid pass log file

   * Workaround against xvid pass log file

   * Should disappear someday

   * Should disappear someday

Lines 230-236	Link Here

    filename = g_build_filename (g_get_tmp_dir (), "xvid-twopass.stats", NULL);

    filename = g_build_filename (g_get_tmp_dir (), "xvid-twopass.stats", NULL);

  else

  else

    filename = ogmrip_fs_mktemp ("log.XXXXXX", NULL);

    filename = ogmrip_fs_mktemp ("log.XXXXXX", NULL);

#endif /* MPLAYER_PRE */

#endif /* MPLAYER_CHECK_VERSION(1,0,0,8) */

  return filename;

  return filename;

Lines 935-951	Link Here

ogmrip_main_merge (OGMRipData *data, OGMRipContainer *container, GError **error)

ogmrip_main_merge (OGMRipData *data, OGMRipContainer *container, GError **error)

  gint result;

  gint result;

#if MPLAYER_PRE < 8

#if !MPLAYER_CHECK_VERSION(1,0,0,8)

  gchar *cwd;

  gchar *cwd;

#endif /* MPLAYER_PRE */

#endif /* !MPLAYER_CHECK_VERSION(1,0,0,8) */

  ogmrip_progress_set_spawn (data->progress_dialog,

  ogmrip_progress_set_spawn (data->progress_dialog,

      OGMJOB_SPAWN (container), _("<b>Merging audio and video streams</b>"));

      OGMJOB_SPAWN (container), _("<b>Merging audio and video streams</b>"));

#if MPLAYER_PRE < 8

#if !MPLAYER_CHECK_VERSION(1,0,0,8)

  cwd = g_get_current_dir ();

  cwd = g_get_current_dir ();

  g_chdir (ogmrip_fs_get_tmp_dir ());

  g_chdir (ogmrip_fs_get_tmp_dir ());

#endif /* MPLAYER_PRE */

#endif /* !MPLAYER_CHECK_VERSION(1,0,0,8) */

  result = ogmjob_spawn_run (OGMJOB_SPAWN (container), error);

  result = ogmjob_spawn_run (OGMJOB_SPAWN (container), error);

Lines 954-963	Link Here

        _("Unknown error while merging"),

        _("Unknown error while merging"),

        _("Please, check http://ogmrip.sf.net to see if this is a known issue"));

        _("Please, check http://ogmrip.sf.net to see if this is a known issue"));

#if MPLAYER_PRE < 8

#if !MPLAYER_CHECK_VERSION(1,0,0,8)

  g_chdir (cwd);

  g_chdir (cwd);

  g_free (cwd);

  g_free (cwd);

#endif /* MPLAYER_PRE */

#endif /* !MPLAYER_CHECK_VERSION(1,0,0,8) */

  return result;

  return result;

Attachment #100698: ogmrip-0.10.0-mplayer-rc patch for bug #152496