]> granicus.if.org Git - handbrake/commitdiff
preset: Move preset-related resources to separate directory.
authorBradley Sepos <bradley@bradleysepos.com>
Sat, 4 Jun 2016 12:36:30 +0000 (08:36 -0400)
committerBradley Sepos <bradley@bradleysepos.com>
Sun, 26 Jun 2016 02:45:45 +0000 (22:45 -0400)
libhb/preset.c
libhb/preset_builtin.h [moved from libhb/builtin_presets.h with 100% similarity]
preset/preset_builtin.json [moved from libhb/preset_builtin.json with 100% similarity]
preset/preset_builtin.list [moved from libhb/libhb_presets.list with 100% similarity]
preset/preset_template.json [moved from libhb/preset_template.json with 100% similarity]
scripts/build-presets.sh

index 11e82e0711a7dca97cba117768d31ea85042a122..1164485ee84e352fd26bd82a4a3f19b2a34a170d 100644 (file)
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "builtin_presets.h"
+#include "preset_builtin.h"
 #include "hb.h"
 #include "hb_dict.h"
 #include "plist.h"
index da729dd5bfaff83104a6833e2b9c1da7cd5a56a4..c89da2d35f37b0ac0e60b6405177180fbee9e770 100755 (executable)
@@ -5,8 +5,9 @@ SELF="${BASH_SOURCE[0]}"
 BASE_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd -P)
 BASE_DIR="${BASE_DIR:-$(pwd)}"
 LIBHB_DIR="${BASE_DIR}/../libhb"
+PRESETS_DIR="${BASE_DIR}/../preset"
 
-if ! cd "${LIBHB_DIR}"; then
+if ! cd "${PRESETS_DIR}"; then
     exit 1
 fi
 
@@ -16,11 +17,11 @@ if [[ "${JSON_TEMP:-}" == "" ]] || [[ "${C_TEMP:-}" == "" ]]; then
     echo "unable to create temporary file" >2
     exit 1
 fi
-"${BASE_DIR}/create_resources.py" libhb_presets.list "${JSON_TEMP}" \
+"${BASE_DIR}/create_resources.py" preset_builtin.list "${JSON_TEMP}" \
 && echo 'const char hb_builtin_presets_json[] =' > "${C_TEMP}" \
 && "${BASE_DIR}/quotestring.py" "${JSON_TEMP}" >> "${C_TEMP}" \
 && echo ';' >> "${C_TEMP}" \
-&& cp "${C_TEMP}" builtin_presets.h
+&& cp "${C_TEMP}" "${LIBHB_DIR}/preset_builtin.h"
 rm "${JSON_TEMP}" "${C_TEMP}"
 
 exit 0