vdr-burn/01_burn-set-pathes.dpatch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## 01_burn-set-pathes.dpatch by Thomas Günther <tom@toms-cafe.de>
   3 ##
   4 ## All lines beginning with `## DP:' are a description of the patch.
   5 ## DP: Set pathes of vdrburn-archive.sh, vdrburn-dvd.sh.
   6
   7 @DPATCH@
   8 diff -urNad vdr-plugin-burn-0.1.0~pre21~/chain-archive.c vdr-plugin-burn-0.1.0~pre21/chain-archive.c
   9 --- vdr-plugin-burn-0.1.0~pre21~/chain-archive.c        2006-09-16 20:33:36.000000000 +0200
  10 +++ vdr-plugin-burn-0.1.0~pre21/chain-archive.c 2006-09-30 22:42:50.000000000 +0200
  11 @@ -69,7 +69,7 @@
  12                 switch (get_job().get_store_mode()) {
  13                 case storemode_create:
  14                         {
  15 -                               shellprocess* burn = new shellprocess( "burn", shellescape( "vdrburn-archive.sh" ) + "mkiso" );
  16 +                               shellprocess* burn = new shellprocess( "burn", shellescape( VDRBURN_ARCHIVE_CMD ) + "mkiso" );
  17                                 burn->put_environment("ISO_FILE",     get_job().get_iso_path());
  18                                 burn->put_environment("GRAFT_POINTS", graftPoints);
  19                                 burn->put_environment("DISC_ID",      get_job().get_volume_id());
  20 @@ -79,7 +79,7 @@
  21
  22                 case storemode_burn:
  23                         {
  24 -                               shellprocess *burn = new shellprocess( "burn", shellescape( "vdrburn-archive.sh" ) + "burndir" );
  25 +                               shellprocess *burn = new shellprocess( "burn", shellescape( VDRBURN_ARCHIVE_CMD ) + "burndir" );
  26                                 burn->put_environment("DVD_DEVICE",   BurnParameters.DvdDevice);
  27                                 burn->put_environment("GRAFT_POINTS", graftPoints);
  28                                 burn->put_environment("BURN_SPEED",   global_setup().BurnSpeed);
  29 @@ -93,7 +93,7 @@
  30                                 string fifo = format("{0}/burnfifo") % get_paths().temp;
  31                                 make_fifo(fifo);
  32
  33 -                               shellprocess* pipe = new shellprocess( "pipe", shellescape( "vdrburn-archive.sh" ) + "pipeiso" );
  34 +                               shellprocess* pipe = new shellprocess( "pipe", shellescape( VDRBURN_ARCHIVE_CMD ) + "pipeiso" );
  35                                 pipe->put_environment("CONFIG_PATH",  plugin::get_config_path());
  36                                 pipe->put_environment("GRAFT_POINTS", graftPoints);
  37                                 pipe->put_environment("ISO_FILE",     get_job().get_iso_path());
  38 @@ -101,7 +101,7 @@
  39                                 pipe->put_environment("DISC_ID",      get_job().get_volume_id());
  40                                 add_process(pipe);
  41
  42 -                               shellprocess* burn = new shellprocess( "burn", shellescape( "vdrburn-archive.sh" ) + "burniso" );
  43 +                               shellprocess* burn = new shellprocess( "burn", shellescape( VDRBURN_ARCHIVE_CMD ) + "burniso" );
  44                                 burn->put_environment("DVD_DEVICE",   BurnParameters.DvdDevice);
  45                                 burn->put_environment("ISO_PIPE",     fifo);
  46                                 burn->put_environment("BURN_SPEED",   global_setup().BurnSpeed);
  47 @@ -114,7 +114,7 @@
  48
  49         bool chain_archive::prepare_recording_mark()
  50         {
  51 -               shellprocess* recordingmark = new shellprocess( "recordingmark", shellescape( "vdrburn-archive.sh" ) + "recordingmark" );
  52 +               shellprocess* recordingmark = new shellprocess( "recordingmark", shellescape( VDRBURN_ARCHIVE_CMD ) + "recordingmark" );
  53                 recordingmark->put_environment("RECORDING_PATH", m_current->get_filename());
  54                 recordingmark->put_environment("CONFIG_PATH", plugin::get_config_path());
  55
  56 @@ -124,7 +124,7 @@
  57
  58         bool chain_archive::prepare_archive_mark()
  59         {
  60 -               shellprocess* archivemark = new shellprocess( "archivemark", shellescape( "vdrburn-archive.sh" ) + "archivemark" );
  61 +               shellprocess* archivemark = new shellprocess( "archivemark", shellescape( VDRBURN_ARCHIVE_CMD ) + "archivemark" );
  62                 archivemark->put_environment("CONFIG_PATH", plugin::get_config_path());
  63
  64                 add_process(archivemark);
  65 diff -urNad vdr-plugin-burn-0.1.0~pre21~/chain-dvd.c vdr-plugin-burn-0.1.0~pre21/chain-dvd.c
  66 --- vdr-plugin-burn-0.1.0~pre21~/chain-dvd.c    2006-09-16 20:33:36.000000000 +0200
  67 +++ vdr-plugin-burn-0.1.0~pre21/chain-dvd.c     2006-09-30 22:42:50.000000000 +0200
  68 @@ -225,7 +225,7 @@
  69                 prepare_recording();
  70
  71                 // start authoring
  72 -               shellprocess* author = new shellprocess( "author", shellescape( "vdrburn-dvd.sh" ) + "author" );
  73 +               shellprocess* author = new shellprocess( "author", shellescape( VDRBURN_DVD_CMD ) + "author" );
  74                 make_dir(xml.get_author_path());
  75                 author->put_environment("DVDAUTHOR_XML",  xml.get_xml_path());
  76                 author->put_environment("DVDAUTHOR_PATH", xml.get_author_path());
  77 @@ -253,7 +253,7 @@
  78                 m_pxAudioIndex = 0;
  79
  80                 // processes
  81 -               shellprocess* demux = new shellprocess( "demux", shellescape( "vdrburn-dvd.sh" ) + demux_call);
  82 +               shellprocess* demux = new shellprocess( "demux", shellescape( VDRBURN_DVD_CMD ) + demux_call);
  83                 demux->put_environment("RECORDING_PATH", m_currentRecording->get_filename());
  84                 demux->put_environment("IGNORE_TRACKS",  m_currentRecording->get_ignored_cids());
  85                 demux->put_environment("USED_TRACKS",    m_currentRecording->get_used_cids());
  86 @@ -274,7 +274,7 @@
  87                         else
  88                                 requant_call = "requant";
  89
  90 -                       shellprocess* requant = new shellprocess( "requant", shellescape( "vdrburn-dvd.sh" ) + requant_call );
  91 +                       shellprocess* requant = new shellprocess( "requant", shellescape( VDRBURN_DVD_CMD ) + requant_call );
  92                         requant->put_environment("VIDEO_FILE",     m_currentRecording->get_video_track_path());
  93                         requant->put_environment("REQUANT_FILE",   m_currentRecording->get_requant_path());
  94                         requant->put_environment("REQUANT_FACTOR", get_job().get_requant_factor());
  95 @@ -282,7 +282,7 @@
  96                         add_process(requant);
  97                 }
  98
  99 -               shellprocess* mplex = new shellprocess( "mplex", shellescape( "vdrburn-dvd.sh" ) + "mplex" );
 100 +               shellprocess* mplex = new shellprocess( "mplex", shellescape( VDRBURN_DVD_CMD ) + "mplex" );
 101                 mplex->put_environment("MOVIE_FILE",     m_currentRecording->get_movie_path());
 102                 mplex->put_environment("MPEG_DATA_PATH", m_currentRecording->get_paths().data);
 103                 mplex->put_environment("MPEG_TMP_PATH",  m_currentRecording->get_paths().temp);
 104 @@ -354,7 +354,7 @@
 105                 switch (get_job().get_store_mode()) {
 106                 case storemode_create:
 107                         {
 108 -                               shellprocess* burn = new shellprocess( "burn", shellescape( "vdrburn-dvd.sh" ) + "mkiso" );
 109 +                               shellprocess* burn = new shellprocess( "burn", shellescape( VDRBURN_DVD_CMD ) + "mkiso" );
 110                                 burn->put_environment("DVDAUTHOR_PATH",
 111                                                                   dvdauthor_xml::get_author_path(get_job()));
 112                                 burn->put_environment("ISO_FILE", get_job().get_iso_path());
 113 @@ -371,7 +371,7 @@
 114                                 else
 115                                         burn_call = "burndir";
 116
 117 -                               shellprocess* burn = new shellprocess( "burn", shellescape( "vdrburn-dvd.sh" ) + burn_call );
 118 +                               shellprocess* burn = new shellprocess( "burn", shellescape( VDRBURN_DVD_CMD ) + burn_call );
 119                                 burn->put_environment("DVDAUTHOR_PATH", dvdauthor_xml::get_author_path(get_job()));
 120                                 burn->put_environment("DVD_DEVICE", BurnParameters.DvdDevice);
 121                                 burn->put_environment("BURN_SPEED", global_setup().BurnSpeed);
 122 @@ -386,7 +386,7 @@
 123                                 fifofmt % get_paths().temp;
 124                                 make_fifo( fifofmt.str() );
 125
 126 -                               shellprocess* pipe = new shellprocess( "pipe", shellescape( "vdrburn-dvd.sh" ) + "pipeiso" );
 127 +                               shellprocess* pipe = new shellprocess( "pipe", shellescape( VDRBURN_DVD_CMD ) + "pipeiso" );
 128                                 pipe->put_environment("DVDAUTHOR_PATH", dvdauthor_xml::get_author_path(get_job()));
 129                                 pipe->put_environment("ISO_FILE",       get_job().get_iso_path());
 130                                 pipe->put_environment("ISO_PIPE",       fifofmt.str());
 131 @@ -399,7 +399,7 @@
 132                                 else
 133                                         burn_call = "burniso";
 134
 135 -                               shellprocess* burn = new shellprocess( "burn", shellescape( "vdrburn-dvd.sh" ) + burn_call );
 136 +                               shellprocess* burn = new shellprocess( "burn", shellescape( VDRBURN_DVD_CMD ) + burn_call );
 137                                 burn->put_environment("DVD_DEVICE", BurnParameters.DvdDevice);
 138                                 burn->put_environment("ISO_PIPE",   fifofmt.str());
 139                                 burn->put_environment("BURN_SPEED", global_setup().BurnSpeed);
 140 @@ -453,7 +453,7 @@
 141
 142         bool chain_dvd::prepare_dmh_archive()
 143         {
 144 -               shellprocess* dmharchive = new shellprocess( "dmharchive", shellescape( "vdrburn-dvd.sh" ) + "dmharchive" );
 145 +               shellprocess* dmharchive = new shellprocess( "dmharchive", shellescape( VDRBURN_DVD_CMD ) + "dmharchive" );
 146                 dmharchive->put_environment("DVDAUTHOR_PATH", dvdauthor_xml::get_author_path(get_job()));
 147                 dmharchive->put_environment("RECORDING_PATH", m_currentRecording->get_filename());
 148                 dmharchive->put_environment("TEMP_PATH",  m_currentRecording->get_paths().temp);
 149 @@ -468,7 +468,7 @@
 150
 151         bool chain_dvd::prepare_archive_mark()
 152         {
 153 -               shellprocess* archivemark = new shellprocess( "archivemark", shellescape( "vdrburn-dvd.sh" ) + "archivemark" );
 154 +               shellprocess* archivemark = new shellprocess( "archivemark", shellescape( VDRBURN_DVD_CMD ) + "archivemark" );
 155                 archivemark->put_environment("DVDAUTHOR_PATH", dvdauthor_xml::get_author_path(get_job()));
 156                 archivemark->put_environment("CONFIG_PATH",    plugin::get_config_path());
 157
 158 diff -urNad vdr-plugin-burn-0.1.0~pre21~/common.h vdr-plugin-burn-0.1.0~pre21/common.h
 159 --- vdr-plugin-burn-0.1.0~pre21~/common.h       2006-09-16 20:33:36.000000000 +0200
 160 +++ vdr-plugin-burn-0.1.0~pre21/common.h        2006-09-30 22:42:50.000000000 +0200
 161 @@ -18,6 +18,9 @@
 162  #define JOBNAMELEN 255
 163  #define MAXATRACKS (MAXAPIDS + MAXDPIDS)
 164
 165 +#define VDRBURN_ARCHIVE_CMD "/usr/share/vdr-plugin-burn/vdrburn-archive.sh"
 166 +#define VDRBURN_DVD_CMD     "/usr/share/vdr-plugin-burn/vdrburn-dvd.sh"
 167 +
 168  class cRecording;
 169
 170  namespace vdr_burn
 171 diff -urNad vdr-plugin-burn-0.1.0~pre21~/proctools/proctest.cc vdr-plugin-burn-0.1.0~pre21/proctools/proctest.cc
 172 --- vdr-plugin-burn-0.1.0~pre21~/proctools/proctest.cc  2006-09-16 17:22:02.000000000 +0200
 173 +++ vdr-plugin-burn-0.1.0~pre21/proctools/proctest.cc   2006-09-30 22:42:50.000000000 +0200
 174 @@ -94,7 +94,7 @@
 175
 176         make_dir("data/dvdauthor");
 177
 178 -       proc = new shellprocess("author", "vdrburn-dvd.sh author");
 179 +       proc = new shellprocess("author", VDRBURN_DVD_CMD" author");
 180         proc->put_environment("DVDAUTHOR_PATH", "data/dvdauthor");
 181         add_process(proc);
 182
 183 @@ -117,13 +117,13 @@
 184
 185  void procchain_dvd::prepare_recording()
 186  {
 187 -       process *proc = new shellprocess("demux", "vdrburn-dvd.sh demux");
 188 +       process *proc = new shellprocess("demux", VDRBURN_DVD_CMD" demux");
 189         proc->put_environment("RECORDING_PATH", recs[m_index].path);
 190         proc->put_environment("VIDEO_FILE", recs[m_index].video);
 191         proc->put_environment("MPEG_PATH", recs[m_index].temp);
 192         add_process(proc);
 193
 194 -       proc = new shellprocess("mplex", "vdrburn-dvd.sh mplex");
 195 +       proc = new shellprocess("mplex", VDRBURN_DVD_CMD" mplex");
 196         proc->put_environment("VIDEO_FILE", recs[m_index].video);
 197         proc->put_environment("AUDIO_FILES", recs[m_index].audio);
 198         proc->put_environment("MOVIE_FILE", recs[m_index].movie);
 199 diff -urNad vdr-plugin-burn-0.1.0~pre21~/render.c vdr-plugin-burn-0.1.0~pre21/render.c
 200 --- vdr-plugin-burn-0.1.0~pre21~/render.c       2006-09-16 20:33:36.000000000 +0200
 201 +++ vdr-plugin-burn-0.1.0~pre21/render.c        2006-09-30 22:42:50.000000000 +0200
 202 @@ -101,7 +101,7 @@
 203                 config.write( page );
 204
 205                 // TODO: move rendering into chain
 206 -               shellprocess render( "render", shellescape( "vdrburn-dvd.sh" ) + "render" );
 207 +               shellprocess render( "render", shellescape( VDRBURN_DVD_CMD ) + "render" );
 208                 render.put_environment( "MENU_BACKGROUND", item.get_menu_background( page ) );
 209                 render.put_environment( "MENU_SOUNDTRACK", plugin::get_config_path() + "/menu-silence.mp2" );
 210                 render.put_environment( "MENU_XML", config.get_xml_path( page ) );
 211 diff -urNad vdr-plugin-burn-0.1.0~pre21~/vdrburn-dvd.sh vdr-plugin-burn-0.1.0~pre21/vdrburn-dvd.sh
 212 --- vdr-plugin-burn-0.1.0~pre21~/vdrburn-dvd.sh 2006-08-27 20:34:30.000000000 +0200
 213 +++ vdr-plugin-burn-0.1.0~pre21/vdrburn-dvd.sh  2006-09-30 22:43:26.000000000 +0200
 214 @@ -60,9 +60,9 @@
 215                 fi
 216
 217                 vdrsync.pl -o "$MPEG_TMP_PATH" \
 218 -                       -v-filter "burn-buffers" \
 219 -                       -a-filter "burn-buffers" \
 220 -                       -ac3-filter "burn-buffers" \
 221 +                       -v-filter "/usr/lib/vdr-plugin-burn/burn-buffers" \
 222 +                       -a-filter "/usr/lib/vdr-plugin-burn/burn-buffers" \
 223 +                       -ac3-filter "/usr/lib/vdr-plugin-burn/burn-buffers" \
 224                         $CUT $IGNORE "$RECORDING_PATH/"
 225         ;;
 226
 227 @@ -146,7 +146,7 @@
 228                         SPU=$MPEG_DATA_PATH
 229                 elif [ "!" "x$SUP" = "x" ]; then
 230                         # from http://www.guru-group.fi/~too/sw/m2vmp2cut/
 231 -                       pxsup2dast "$SUP"*
 232 +                       /usr/lib/vdr-plugin-burn/pxsup2dast "$SUP"*
 233                         SPU=$(find "$MPEG_DATA_PATH" -name \*.d)
 234                 fi
 235