comparison mencoder.c @ 8164:487cfc28525d

New config system + cleanup of header inter dependency

8163:51e5033ee687

"\n";

#include "cpudetect.h"

#include "codec-cfg.h"
#include "cfgparser.h"

#include "libmpdemux/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
#include "libmpdemux/mp3_hdr.h"
#include "libmpdemux/aviwrite.h"

#include "playtree.h"

#include "libvo/video_out.h"

#include "libao2/afmt.h"

//static int vo_w=0, vo_h=0;

//-------------------------- config stuff:

m_config_t* mconfig;

static int cfg_inc_verbose(struct config *conf){ ++verbose; return 0;}

static int cfg_include(struct config *conf, char *filename){
	return m_config_parse_config_file(mconfig, filename);

#endif

double v_pts_corr=0;
double v_timer_corr=0;

play_tree_t* playtree;
play_tree_iter_t* playtree_iter;
char* filename=NULL;
char* frameno_filename="frameno.avi";

int decoded_frameno=0;
int next_frameno=-1;

    mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
    mencoder_exit(1,NULL);
  }
}

  // FIXME: get rid of -dvd and other tricky options and config/playtree
  stream2=open_stream(frameno_filename,0,&i);
  if(stream2){
    demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2);
    if(demuxer2) printf(MSGTR_UsingPass3ControllFile,frameno_filename);
  }

  playtree = play_tree_new();
  mconfig = m_config_new(playtree);
  m_config_register_options(mconfig,mencoder_opts);
  parse_cfgfiles(mconfig);

	playtree_iter = NULL;
      }
      filename = play_tree_iter_get_file(playtree_iter,1);
    }
  }

  if(!filename && !vcd_track && !dvd_title && !tv_param_on){
	printf(MSGTR_MissingFilename);
	mencoder_exit(1,NULL);
  }

8164:487cfc28525d

"\n";

#include "cpudetect.h"

#include "codec-cfg.h"
#ifdef NEW_CONFIG
#include "m_option.h"
#include "m_config.h"
#include "parser-mecmd.h"
#else
#include "cfgparser.h"
#include "playtree.h"
#endif

#include "libmpdemux/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
#include "libmpdemux/mp3_hdr.h"
#include "libmpdemux/aviwrite.h"


#include "libvo/video_out.h"

#include "libao2/afmt.h"

//static int vo_w=0, vo_h=0;

//-------------------------- config stuff:

m_config_t* mconfig;

#ifdef NEW_CONFIG
extern int
m_config_parse_config_file(m_config_t* config, char *conffile);
#endif


static int cfg_inc_verbose(struct config *conf){ ++verbose; return 0;}

static int cfg_include(struct config *conf, char *filename){
	return m_config_parse_config_file(mconfig, filename);

#endif

double v_pts_corr=0;
double v_timer_corr=0;

#ifdef NEW_CONFIG
m_entry_t* filelist = NULL;
#else
play_tree_t* playtree;
play_tree_iter_t* playtree_iter;
#endif
char* filename=NULL;
char* frameno_filename="frameno.avi";

int decoded_frameno=0;
int next_frameno=-1;

    mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
    mencoder_exit(1,NULL);
  }
}

  // FIXME: get rid of -dvd and other tricky options
  stream2=open_stream(frameno_filename,0,&i);
  if(stream2){
    demuxer2=demux_open(stream2,DEMUXER_TYPE_AVI,-1,-1,-2);
    if(demuxer2) printf(MSGTR_UsingPass3ControllFile,frameno_filename);
  }

  // New config code
#ifdef NEW_CONFIG
 mconfig = m_config_new();
 m_config_register_options(mconfig,mencoder_opts);
 parse_cfgfiles(mconfig);
 filelist = m_config_parse_me_command_line(mconfig, argc, argv);
 if(!filelist) mencoder_exit(1, "error parsing cmdline");
 m_entry_set_options(mconfig,&filelist[0]);
 filename = filelist[0].name;
 // Warn the user if he put more than 1 filename ?
#else
  playtree = play_tree_new();
  mconfig = m_config_new(playtree);
  m_config_register_options(mconfig,mencoder_opts);
  parse_cfgfiles(mconfig);

	playtree_iter = NULL;
      }
      filename = play_tree_iter_get_file(playtree_iter,1);
    }
  }
#endif

  if(!filename && !vcd_track && !dvd_title && !tv_param_on){
	printf(MSGTR_MissingFilename);
	mencoder_exit(1,NULL);
  }