diff --git a/.gitignore b/.gitignore index 276f2f0..0a9749d 100755 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ passphrase.bin s_lockValue.bin release-configs/* appData/* +ffmpeg-coder/usr/* ### CMake ### CMakeLists.txt.user @@ -56,4 +57,4 @@ CMakeUserPresets.json build/* ### CMake Patch ### # External projects -*-prefix/ \ No newline at end of file +*-prefix/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ad2237..b3a54bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Use cmake -G "Mingw Makefiles" before using Cmake on windows with g++ (mingw) compiler cmake_minimum_required(VERSION 3.12) -project(ffmpeg-coder VERSION 1.0.0) +project(ffmpeg-coder VERSION 2.0.0) message("FFMPEG CODER BUILD PROCESS") message("--------------------------") diff --git a/Makefile.own b/Makefile.own index 4a9b64c..2a6768c 100644 --- a/Makefile.own +++ b/Makefile.own @@ -54,3 +54,8 @@ winbuild: winrun: echo Running the built program.... ./${BUILDDIR}/${APPNAME}.exe + +.PHONY: winProductionBuild +winProductionBuild: + echo Building release version..... + ${CC} ${CFLAG} src\ffmpeg-coder.cpp src\frontend_funcs.cpp src\main.cpp src\quickConvertSettings.cpp src\utils.cpp ${INC} -static-libgcc -static-libstdc++ -o ${BUILDDIR}/${APPNAME}.exe \ No newline at end of file diff --git a/appData/s_lockValue.bin b/appData/s_lockValue.bin deleted file mode 100644 index c227083..0000000 --- a/appData/s_lockValue.bin +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/docs/README.md b/docs/README.md index 97a4996..9ba2d68 100755 --- a/docs/README.md +++ b/docs/README.md @@ -41,11 +41,13 @@ The user should have really basic knowledge about ffmpeg like how to run ffmpeg - The installer will start & then just follow the onscreen instructions and ffmpeg-coder will be installed on your machine - After installation, from the start menu search for **_ffmpeg-coder_** and open the tool. -## Linux (Debian based distros) +## Linux + +### Debian based distros This installation process works on ubuntu, kali linux, linux mint, debian and other debian based distros. -### Automatic One Click Process +#### Automatic One Click Process - Just copy and paste this script below and **_voila_** @@ -53,7 +55,7 @@ This installation process works on ubuntu, kali linux, linux mint, debian and ot wget https://raw.githubusercontent.com/Abir-Tx/ffmpeg-coder/main/scripts/debian_install.sh && chmod +x debian_install.sh &&./debian_install.sh ``` -### Manual Download Process +#### Manual Download Process - First download the **ffmpeg-coder_1.0_all.deb** from the release or from [here](https://github.com/Abir-Tx/ffmpeg-coder/releases/download/v1.0/ffmpeg-coder_1.0_all.deb). - Then open terminal to the folder where the .deb file is downloaded. @@ -66,6 +68,16 @@ sudo apt install ./ffmpeg-coder_1.0_all.deb - **_ffmpeg-coder_** should be installed now. Now run `ffmpeg-coder` in your terminal. Sometime if running just after installation the tool might not start. In that case run `ffmpeg-coder` in terminal twice. +### Arch Linux + +If you are on Arch Linux you can install ffmpeg-coder from the AUR using a AUR helper easily + +```bash +yay -S ffmpeg-coder +``` + + + ## Install from source Users other than Debian based distro can use the tool by compiling the tool from the source code easily. Also any distro or windows users can compile and use the tool if they are having problems using the binary packages provided in the release. @@ -88,17 +100,17 @@ cd ffmpeg-coder - **Linux** -Now if you are in linux & have build-essentian installed then just run - +Now if you are in linux & have build-essentials installed then just run - ```bash -make dir -make build +make -f Makefile.own dir +make -f Makefile.own build ``` The tool will be compiled to the `bin` folder inside ffmpeg-coder folder. You can also run `make run` to run the tool from there - ```bash -make run +make -f Makefile.own run ``` - **Windows** @@ -106,14 +118,14 @@ make run If you are windows user and have **\*GNU Make** installed or configured in your system then run - ```batch -make dir -make winbuild +make -f Makefile.own dir +make -f Makefile.own winbuild ``` The tool will be compiled to the `bin` folder inside ffmpeg-coder folder. You can also run `make winrun` to run the tool from there - ```batch -make winrun +make -f Makefile.own winrun ``` ## Using G++ diff --git a/ffmpeg-coder/DEBIAN/changelog b/ffmpeg-coder/DEBIAN/changelog index 775344a..158ae3d 100644 --- a/ffmpeg-coder/DEBIAN/changelog +++ b/ffmpeg-coder/DEBIAN/changelog @@ -1,3 +1,10 @@ +ffmpeg-coder (1.9.0) unstable: urgency=low + +* New quick convert menu entry +* New quick convert settings added +* Bug fixes +* Upgrade the source code base + ffmpeg-coder (1.0) stable: urgency=low * Initial release. diff --git a/ffmpeg-coder/DEBIAN/control b/ffmpeg-coder/DEBIAN/control index 22e8cec..14adb84 100644 --- a/ffmpeg-coder/DEBIAN/control +++ b/ffmpeg-coder/DEBIAN/control @@ -3,10 +3,10 @@ Section: misc Priority: optional Maintainer: abir-tx Build-Depends: g++, make -Standard-Version: 1.0 +Standard-Version: 1.0.0 Homepage: http://www.github.com/abir-tx/ffmpeg-coder Package: ffmpeg-coder -Version: 1.0 +Version: 1.9.0 Architecture: all Essential: no Size: 20 diff --git a/src/frontend_funcs.cpp b/src/frontend_funcs.cpp index e05d3d7..839cf30 100644 --- a/src/frontend_funcs.cpp +++ b/src/frontend_funcs.cpp @@ -71,7 +71,7 @@ void settings() { void homepage() { using namespace std; - ffmpeg ffmpeg; // Creating ffmpeg object + int choice; /* The char goBack variable is used for navigating to the main screen using @@ -103,13 +103,17 @@ void homepage() { // Entering into selected option funcs if (choice == 1) { + ffmpeg *fmpg = new ffmpeg(); // Creating ffmpeg object clear_screen(); - ffmpeg.load_encodes(); - ffmpeg.show_encodes(); - ffmpeg.select_encodes(); - ffmpeg.selected_action(); + fmpg->load_encodes(); + fmpg->show_encodes(); + fmpg->select_encodes(); + fmpg->selected_action(); + delete fmpg; } else if (choice == 2) { - ffmpeg.quickConvert(); + ffmpeg *fmpg = new ffmpeg(); // Creating ffmpeg object + fmpg->quickConvert(); + delete fmpg; } else if (choice == 3) { about(); } else if (choice == 4) {