diff --git a/AnalyzeMedia.cpp b/AnalyzeMedia.cpp index 94ae307..1f73681 100755 --- a/AnalyzeMedia.cpp +++ b/AnalyzeMedia.cpp @@ -1,9 +1,21 @@ -/* - * File: AnalyzeMedia.cpp - * Author: CutePoisonX - * - * Created on 10. Februar 2013, 10:14 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include @@ -27,7 +39,7 @@ int AnalyzeMedia::saveToVector(string& param1, string& param2, string& param3, string& param4, string& param5, unsigned int priority, unsigned int identifier) { - vector& tmp = getVector(identifier); + vector& tmp = getVector(identifier); tmp.push_back(new StreamPreference(param1, param2, param3, param4, param5)); } diff --git a/AnalyzeMedia.h b/AnalyzeMedia.h index 3620631..dee1d68 100755 --- a/AnalyzeMedia.h +++ b/AnalyzeMedia.h @@ -1,9 +1,21 @@ -/* - * File: AnalyzeMedia.h - * Author: CutePoisonX - * - * Created on 10. Februar 2013, 10:14 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef ANALYZEMEDIA_H #define ANALYZEMEDIA_H diff --git a/CHANGELOG b/CHANGELOG index 90b3e09..d940b90 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,23 @@ +Version 1.4 1) Added recursive directory scanning for movies + 2) Config-files are located in /opt/etc/PoisonConvert_Config-files by default + 3) Added config-file for the chromecast + 4) Processed files get now only deleted when conversion was successful + (this makes the "delete"-setting saver) + The success is determined by comparing the duration and streams. + 5) Failed files are reverted automatically (they do not get .old etc. + appended) + 6) Added makefile installer + 7) Removed some bad "system" calls + 8) Added functionality to specify "-" for the container in order to analyze any file + 9) Bugfixes + 10) Added licence +------------------------------------------------------------------------------------------ Version 1.3 1) Rewritten settings-behaviour (it is much easier now to add settings) 2) Added useful settings 3) poisonconvert can now be placed in /opt/bin/ (global scope) 4) Enhanced Logfile 5) No restart necessary after changing the config-file - 6) Settings-file is now created in /opt/etc/ and will be created automatically (filename: PoisonConver_Settings) + 6) Settings-file is now created in /opt/etc/ and will be created automatically (filename: PoisonConvert_Settings) 7) All temporary files are now created in /opt/tmp/ 8) Changed some prompts 9) Bugfixes diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..20d40b6 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/ConfigMode.cpp b/ConfigMode.cpp index 64f2f3f..434c6ab 100755 --- a/ConfigMode.cpp +++ b/ConfigMode.cpp @@ -1,9 +1,21 @@ -/* - * File: ConfigMode.cpp - * Author: CutePoisonX - * - * Created on 04. Februar 2013, 14:34 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "ConfigMode.h" #include "UserInterface.h" @@ -1559,10 +1571,10 @@ int ConfigMode::listRule(string& param_prompt1, string& param_prompt2, ui_.writeString(" is "); ui_.writeString(param1_); } + ui_.writeString(", "); } if (param2_ != "-") { - ui_.writeString(", "); ui_.writeString(param_prompt2); if (param2_.compare(0, 3, "NOT") == 0) { @@ -1718,10 +1730,10 @@ int ConfigMode::deleteConfig() ui_.writeString(" Do you want to delete an output-stream or a rule?", true); ui_.writeString(" ["); ui_.writeString("rule", false, "yellow"); - ui_.writeString("] - create new rule", true); //OK + ui_.writeString("] - delete rule", true); ui_.writeString(" ["); ui_.writeString("target", false, "yellow"); - ui_.writeString("] - create new output-stream", true); + ui_.writeString("] - delete output-stream", true); ui_.writeString(" ["); ui_.writeString("exit", false, "yellow"); ui_.writeString("] - go back", true); diff --git a/ConfigMode.h b/ConfigMode.h index 0272ad7..fed195a 100755 --- a/ConfigMode.h +++ b/ConfigMode.h @@ -1,9 +1,21 @@ -/* - * File: ConfigMode.h - * Author: CutePoisonX - * - * Created on 04. Februar 2013, 14:34 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef CONFIGMODE_H #define CONFIGMODE_H diff --git a/FileException.cpp b/FileException.cpp index 489c0fa..1a23101 100755 --- a/FileException.cpp +++ b/FileException.cpp @@ -1,9 +1,21 @@ -/* - * File: FileException.cpp - * Author: CutePoisonX - * - * Created on 08. Februar 2013, 10:43 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "FileException.h" @@ -22,4 +34,4 @@ FileException::~FileException() throw() const char* FileException::what() const throw() { return "There occured an error at reading out a file"; -} \ No newline at end of file +} diff --git a/FileException.h b/FileException.h index 0ff07e8..33d03c3 100755 --- a/FileException.h +++ b/FileException.h @@ -1,9 +1,21 @@ -/* - * File: FileException.h - * Author: CutePoisonX - * - * Created on 08. Februar 2013, 10:43 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef FILEEXCEPTION_H #define FILEEXCEPTION_H diff --git a/FileManager.cpp b/FileManager.cpp index afcdf8b..12afd74 100755 --- a/FileManager.cpp +++ b/FileManager.cpp @@ -1,9 +1,21 @@ -/* - * File: FileManager.cpp - * Author: CutePoisonX - * - * Created on 08. Februar 2013, 09:29 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "FileManager.h" #include "FileWriteException.h" @@ -397,12 +409,12 @@ void FileManager::readImportantFiles(vector& filenames) throw (FileReadE readfile.close(); } -void FileManager::readProperties(string filename) throw (FileReadException, OpenFileException) +void FileManager::readProperties(string filename, string& duration) throw (FileReadException, OpenFileException) { ifstream readfile; string line; string params[5] = {"poison"}; - + unsigned int position = 0; unsigned int position_two = 0; unsigned int position_video = 0; @@ -417,7 +429,29 @@ void FileManager::readProperties(string filename) throw (FileReadException, Open do { getline(readfile, line, '\n'); - if (line.find("Stream", 0) != string::npos) + + if (line.find("Duration", 0) != string::npos) + { + unsigned int duration_pos_beg = line.find_first_of(":") + 2; + unsigned int duration_pos_end = line.find_first_of(","); + string tmp_duration; + + line = line.substr(duration_pos_beg, duration_pos_end - duration_pos_beg); + if (line.find(".") != string::npos) //we don't need to compare fractions of seconds ... + { + tmp_duration = line.substr(0, line.find(".")); + } + else + { + tmp_duration = line; + } + + if (tmp_duration.empty() == false) + { + duration = tmp_duration; + } + } + else if (line.find("Stream", 0) != string::npos) { position = line.find("): ", 0); position = position + 3; diff --git a/FileManager.h b/FileManager.h index 86ca3a6..fbe8575 100755 --- a/FileManager.h +++ b/FileManager.h @@ -1,9 +1,21 @@ -/* - * File: FileManager.h - * Author: CutePoisonX - * - * Created on 08. Februar 2013, 09:29 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef FILEMANAGER_H #define FILEMANAGER_H @@ -37,7 +49,7 @@ class FileManager { string checkPathToConfig(); void readImportantFiles(vector& filenames) throw (FileReadException, OpenFileException); - void readProperties(string filename) throw (FileReadException, OpenFileException); + void readProperties(string filename, string& duration) throw (FileReadException, OpenFileException); void readPropsVideo(string line, unsigned int pos_start, string (¶ms)[5]); void readPropsAudio(string line, unsigned int pos_start, string (¶ms)[5]); void readPropsSub(string line, unsigned int pos_start, string& param0, diff --git a/FileReadException.cpp b/FileReadException.cpp index 836d78f..c6a199f 100755 --- a/FileReadException.cpp +++ b/FileReadException.cpp @@ -1,9 +1,21 @@ -/* - * File: FileSettingsException.cpp - * Author: CutePoisonX - * - * Created on 08. Februar 2013, 10:46 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "FileReadException.h" diff --git a/FileReadException.h b/FileReadException.h index dc87f38..f34e999 100644 --- a/FileReadException.h +++ b/FileReadException.h @@ -1,9 +1,21 @@ -/* - * File: FileSettingsException.h - * Author: CutePoisonX - * - * Created on 08. Februar 2013, 10:46 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef FILEREADEXCEPTION_H #define FILEREADEXCEPTION_H diff --git a/FileWriteException.cpp b/FileWriteException.cpp index 777f599..113097e 100755 --- a/FileWriteException.cpp +++ b/FileWriteException.cpp @@ -1,9 +1,21 @@ -/* - * File: FileWriteException.cpp - * Author: CutePoisonX - * - * Created on 09. Februar 2013, 13:03 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "FileWriteException.h" @@ -22,4 +34,4 @@ FileWriteException::~FileWriteException() throw() const char* FileWriteException::what() const throw() { return "Could not write File"; -} \ No newline at end of file +} diff --git a/FileWriteException.h b/FileWriteException.h index 94e9c8f..f2e9ca9 100755 --- a/FileWriteException.h +++ b/FileWriteException.h @@ -1,9 +1,21 @@ -/* - * File: FileWriteException.h - * Author: CutePoisonX - * - * Created on 09. Februar 2013, 13:03 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef FILEWRITEEXCEPTION_H #define FILEWRITEEXCEPTION_H diff --git a/FolderSetting.cpp b/FolderSetting.cpp index 1cd7863..f4a79ef 100644 --- a/FolderSetting.cpp +++ b/FolderSetting.cpp @@ -1,9 +1,21 @@ -/* - * File: FolderSetting.cpp - * Author: CutePoisonX - * - * Created on 18. Juni 2013, 21:01 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "FolderSetting.h" #include "UserInterface.h" diff --git a/FolderSetting.h b/FolderSetting.h index 4a57a98..903c14d 100644 --- a/FolderSetting.h +++ b/FolderSetting.h @@ -1,9 +1,21 @@ -/* - * File: FolderSetting.h - * Author: CutePoisonX - * - * Created on 18. Juni 2013, 21:01 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef FOLDERSETTING_H #define FOLDERSETTING_H diff --git a/Makefile b/Makefile index e37bcee..9fbabdd 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,13 @@ CXXFLAGS=-c -Wall -g LDFLAGS= SOURCES = $(wildcard *.cpp) OBJECTS = ${SOURCES:.cpp=.o} -TITLE= poisonconvert + +CONFDESTDIR = /opt/etc +DESTDIR = /opt/bin +CONFDIRNAME = PoisonConvert_Config-files +SETTINGS_FILE = /opt/etc/PoisonConvert_Settings + +TITLE = poisonconvert ARCHIVE=$(TITLE).tar.gz .PHONY : all clean debug valgrind archive @@ -34,5 +40,14 @@ valgrind : $(TITLE) archive : tar cfz $(ARCHIVE) --ignore-failed-read *.cpp *.h *.pdf Makefile +install: + install --mode=755 $(TITLE) $(DESTDIR)/ + cp -r $(CONFDIRNAME)/ $(CONFDESTDIR)/$(CONFDIRNAME)/ + +uninstall: + rm $(DESTDIR)/$(TITLE) + rm $(SETTINGS_FILE) + rm -r $(CONFDESTDIR)/$(CONFDIRNAME) + -include $(wildcard ./*.d) \ No newline at end of file diff --git a/Mode.cpp b/Mode.cpp index 745541e..0b88ee9 100755 --- a/Mode.cpp +++ b/Mode.cpp @@ -1,9 +1,21 @@ -/* - * File: Mode.cpp - * Author: CutePoisonX - * - * Created on 08. Februar 2013, 09:41 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "Mode.h" #include "UserInterface.h" diff --git a/Mode.h b/Mode.h index 966944e..cbad56b 100755 --- a/Mode.h +++ b/Mode.h @@ -1,9 +1,21 @@ -/* - * File: Mode.h - * Author: CutePoisonX - * - * Created on 08. Februar 2013, 09:41 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef MODE_H #define MODE_H diff --git a/OpenFileException.cpp b/OpenFileException.cpp index fa799b9..139157d 100755 --- a/OpenFileException.cpp +++ b/OpenFileException.cpp @@ -1,9 +1,21 @@ -/* - * File: OpenFileException.cpp - * Author: CutePoisonX - * - * Created on 09. Februar 2013, 12:25 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "OpenFileException.h" diff --git a/OpenFileException.h b/OpenFileException.h index 243ab6e..1be63c7 100755 --- a/OpenFileException.h +++ b/OpenFileException.h @@ -1,9 +1,21 @@ -/* - * File: OpenFileException.h - * Author: CutePoisonX - * - * Created on 09. Februar 2013, 12:25 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef OPENFILEEXCEPTION_H #define OPENFILEEXCEPTION_H diff --git a/PoisonConvert_Config-files/Chromecast b/PoisonConvert_Config-files/Chromecast new file mode 100644 index 0000000..12b86c9 --- /dev/null +++ b/PoisonConvert_Config-files/Chromecast @@ -0,0 +1,44 @@ +-----Preferences----- +-----START-TARGETS----- +3 +mp4HEXTcopyHEXT-HEXT-HEXT-HEXT +mp4HEXTh264HEXT-HEXT-HEXT-HEXT +copyHEXTcopyHEXT-HEXT-HEXT-HEXT +------END-TARGETS------ +-----START-TARGETS----- +2 +aacHEXT-HEXT-HEXT-HEXT-HEXT +copyHEXT-HEXT-HEXT-HEXT-HEXT +------END-TARGETS------ +-----START-TARGETS----- +1 +mov_textHEXTOFFHEXTOFFHEXTOFFHEXTOFFHEXT +------END-TARGETS------ +------START-RULES------ +3 +mp4HEXT-HEXT-HEXT-HEXT-HEXT +1 +3 +-HEXTh264HEXT-HEXT-HEXT-HEXT +1 +1 +-HEXTNOTh264HEXT-HEXT-HEXT-HEXT +1 +2 +-------END-RULES------- +------START-RULES------ +2 +NOTaacHEXT-HEXT-HEXT-HEXT-HEXT +1 +1 +aacHEXT-HEXT-HEXT-HEXT-HEXT +1 +2 +-------END-RULES------- +------START-RULES------ +1 +NOTmov_textHEXT-HEXT-HEXT-HEXT-HEXT +1 +1 +-------END-RULES------- +-----Preferences----- diff --git a/README.md b/README.md index 2e9e6bd..5494f11 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ A little tool to batch-convert movies This progam was designed to batch-convert movies on a Synology-DiskStation. -Installation guide: +## Installation You can download and compile it on your system with: @@ -15,19 +15,27 @@ You can download and compile it on your system with: 3) make -4) make clean - (You should get an executable named "poisonconvert" - thats it.) - -5) mv poisonconvert /opt/bin/poisonconvert +4) make install Done :) (You can delete the source-files now) +## How to use + For further instructions please read the Wiki: https://github.com/CutePoisonX/PoisonConvert/wiki -If you want to uninstall the program, perform the following steps: +## Deinstallation +If you want to uninstall the program, cd into the source directory and do: + +1) make uninstall + +or perform the following steps: + 1) rm /opt/bin/poisonconvert -2) rm /opt/bin/PoisonConvert_Settings -I don´t take responsibility for any harm done by this program. +2) rm /opt/etc/PoisonConvert_Settings + +3) rm -r /opt/etc/PoisonConvert_Config-files + +and don't forget to remove the other Config files and the log files. diff --git a/Settings.cpp b/Settings.cpp index 9d6492d..9b0c00c 100644 --- a/Settings.cpp +++ b/Settings.cpp @@ -1,9 +1,21 @@ -/* - * File: Settings.cpp - * Author: CutePoisonX - * - * Created on 16. Juni 2013, 21:48 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "Settings.h" #include "UserInterface.h" diff --git a/Settings.h b/Settings.h index cf50271..c7432d4 100644 --- a/Settings.h +++ b/Settings.h @@ -1,9 +1,21 @@ -/* - * File: Settings.h - * Author: CutePoisonX - * - * Created on 16. Juni 2013, 21:48 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef SETTINGS_H #define SETTINGS_H diff --git a/SettingsMode.cpp b/SettingsMode.cpp index c2ae651..c3fb195 100755 --- a/SettingsMode.cpp +++ b/SettingsMode.cpp @@ -1,9 +1,21 @@ -/* - * File: SettingsMode.cpp - * Author: CutePoisonX - * - * Created on 08. Februar 2013, 09:40 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "SettingsMode.h" #include "UserInterface.h" @@ -16,13 +28,13 @@ SettingsMode::SettingsMode(UserInterface& ui) //---------------------------------------------------------------------------- //initialize settings settings_vector_.push_back(new Settings(ui, "config-file", "Selecting filename of config - file", - "Please enter the filename of the configuration-file (if it does not exist it will be created)", "Config")); + "Please enter the filename of the configuration-file (if it does not exist it will be created)", "EmptyConfig")); settings_vector_.push_back(new FolderSetting(ui, "config-path", "Location of config file", - "Please enter the path to the configuration-file", "")); + "Please enter the path to the configuration-file", "/opt/etc/PoisonConvert_Config-files/")); settings_vector_.push_back(new YesNoSetting(ui, "delete", "Delete original file after conversion", - "Do you want to delete the original file after the successful conversion? NOT RECOMMENDET ([y/n])", "No")); + "Do you want to delete the original file after the successful conversion ([y/n])?", "No")); settings_vector_.push_back(new YesNoSetting(ui, "optimize", "Optimize file for streaming (mp4/m4v/mov only)", "Do you want to optimize file for streaming (mov/mp4/m4v only , [y/n])?", "No")); diff --git a/SettingsMode.h b/SettingsMode.h index 759d36b..fce56d0 100755 --- a/SettingsMode.h +++ b/SettingsMode.h @@ -1,9 +1,21 @@ -/* - * File: SettingsMode.h - * Author: CutePoisonX - * - * Created on 08. Februar 2013, 09:40 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef SETTINGSMODE_H #define SETTINGSMODE_H diff --git a/StartMode.cpp b/StartMode.cpp old mode 100755 new mode 100644 index 40a223c..d68676b --- a/StartMode.cpp +++ b/StartMode.cpp @@ -1,14 +1,30 @@ -/* - * File: StartMode.cpp - * Author: CutePoisonX - * - * Created on 10. Februar 2013, 10:02 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "StartMode.h" #include "UserInterface.h" #include #include +#include +#include +#include +#include StartMode::StartMode(UserInterface& ui, VectorSourceManager& man, FileManager& fileman, AnalyzeMedia& analyze, @@ -29,10 +45,68 @@ StartMode::~StartMode() { } +int StartMode::listDirectory(string dir, vector& files_of_interest) +{ + DIR* target_dir; + + target_dir = opendir(dir.c_str()); + if(target_dir == NULL) + { + return -1; + } + + struct dirent* dirP; + struct stat filestat; + std::string path; + while( (dirP = readdir(target_dir)) ) + { + //Skip current object if it is this directory or parent directory + if(!strncmp(dirP->d_name, ".", 1) || !strncmp(dirP->d_name, "..", 2)) + { + continue; + } + + if(dir == ".") + { + path = dirP->d_name; + } + else + { + path = dir + "/" + dirP->d_name; + } + + stat(path.c_str(), &filestat); + + //Recursively call this function if current object is a directory + if(S_ISDIR(filestat.st_mode)) + { + listDirectory(path, files_of_interest); + continue; + } + + string path_ext = path.substr(path.find_last_of(".") + 1); + unsigned int vec_size = important_files_.size(); + + for(unsigned int k = 0; k < vec_size; k++) + { + if ((path_ext == important_files_.at(k) || + important_files_.at(k) == "-") && path_ext != "old") + { + ui_.writeString("Found file: " + path, true); + files_of_interest.push_back(path); + break; + } + } + } + + closedir(target_dir); + + return 0; +} + int StartMode::gettingFiles() { string fileextension; - string list_dirs = "ls "; // linux: "ls *." windows: "dir *." bool already_here = false; unsigned int vec_size = 0; @@ -58,18 +132,21 @@ int StartMode::gettingFiles() important_files_.push_back(fileextension); } } - //getting files - vec_size = important_files_.size(); - for(unsigned int k = 0; k < vec_size; k++) + //getting files + vector files_of_interest; + string directory_to_list = settings_.getSettingsParam(MOVIEPATH); + + if (listDirectory(directory_to_list.substr(0, directory_to_list.size() - 1), files_of_interest) == -1) { - list_dirs = "ls *."; - list_dirs.append(important_files_.at(k)); - list_dirs.append(" >> /opt/tmp/poisonXfileslist 2>/dev/null"); - system(list_dirs.c_str()); + ui_.writeString("Could not open source directory! Can not continue ..."); + throw OpenFileException(); + } + else + { + important_files_.clear(); + important_files_ = files_of_interest; } - important_files_.clear(); - fileman_.readImportantFiles(important_files_); } int StartMode::executeCommand() @@ -80,33 +157,38 @@ int StartMode::executeCommand() string old_filename; string old_fileext; - string rename = "mv \""; - string delete_orig = "rm \""; - string dive_into_dir = settings_.getSettingsParam(MOVIEPATH); string log_erase; unsigned int position = 0; unsigned int job = 0; + unsigned int failed_items = 0; - chdir(dive_into_dir.c_str()); - + if (vecman_.getVectorLen(SRCVIDEO) == 0) + { + ui_.writeString("You have to enter at least one video-rule to start.", true); + return -1; + } + try { gettingFiles(); } catch (FileException) { - ui_.writeString("There occured an error at reading out the temporary file 'poisonXfileslist'! Please check my "); - ui_.writeString("rights to do so.", true); - exit_now = false; + ui_.writeString("Could not get any files to process.", true); + exit_now = true; } - system("rm /opt/tmp/poisonXfileslist 2>/dev/null"); + if (exit_now != true) { for(job = 0; job < important_files_.size(); job++) { + int ffmpeg_response = 1; + bool conversion_success = false; + + string filename_without_path = important_files_.at(job).substr(important_files_.at(job).find_last_of("/") + 1); logfile_ = "\" >> \""; logfile_.append(settings_.getSettingsParam(LOGPATH)); - logfile_.append(important_files_.at(job)); + logfile_.append(filename_without_path); logfile_.append(".log"); logfile_.append("\""); @@ -118,19 +200,19 @@ int StartMode::executeCommand() ui_.writeString("/", false, "red"); ui_.writeNumber(important_files_.size(), false, "red"); ui_.writeString(": ", false, "red"); - ui_.writeString(important_files_.at(job), true, "red"); + ui_.writeString(filename_without_path, true, "red"); - gettingInfos(important_files_.at(job)); + WriteLog("1. Analyzed File"); + WriteLog(""); + gettingInfos(important_files_.at(job), movie_duration_); applySettings(); - rename = "mv \""; filename_noext = important_files_.at(job); position = filename_noext.find_last_of("."); old_fileext = filename_noext.substr(position, filename_noext.length() - position); filename_noext.erase(position + 1, filename_noext.length()); - old_filename = important_files_.at(job); old_filename.append(".old"); @@ -144,12 +226,7 @@ int StartMode::executeCommand() analyze_.getVectorLen(SRCSUB)) old_filename.append("_ns"); - rename.append(important_files_.at(job)); - rename.append("\" \""); - rename.append(old_filename); - rename.append("\" 2>/dev/null"); - - system(rename.c_str()); + rename(important_files_.at(job).c_str(), old_filename.c_str()); ffmpeg_input = "ffmpeg -i \""; ffmpeg_input.append(old_filename); @@ -158,6 +235,10 @@ int StartMode::executeCommand() ffmpeg_input.append(targets_); ffmpeg_input.append(" -strict -2 -y \""); + if (out_container_ == "-") + { + out_container_ = important_files_.at(job).substr(0, important_files_.at(job).find_last_of(".")); + } filename_noext.append(out_container_); ffmpeg_input.append(filename_noext); @@ -165,59 +246,100 @@ int StartMode::executeCommand() ffmpeg_input.append("\" 2>> "); log_erase = logfile_; - log_erase.erase(0,5); //delete: [" >> ] (without brackets) form logfile + log_erase.erase(0,5); //delete: [" >> ] (without brackets) from logfile ffmpeg_input.append(log_erase); ui_.writeString(" Converting...", true, "yellow"); - system(ffmpeg_input.c_str()); - ui_.writeString(" Finished converting...", true, "yellow"); - - if(settings_.getSettingsParam(OPTIMIZESET) == "Yes" && (out_container_ == "m4v" || - out_container_ == "mov" || out_container_ == "mp4")) - optimizeFile(filename_noext, log_erase); - - system("rm /opt/tmp/poisonXprobelist 2>/dev/null"); - MoveFile(filename_noext); - + ffmpeg_response = system(ffmpeg_input.c_str()); + conversion_success = checkForConversionSuccess(ffmpeg_response, filename_noext); + if (conversion_success) + { + ui_.writeString(" Finished converting...", true, "yellow"); + if(settings_.getSettingsParam(OPTIMIZESET) == "Yes" && (out_container_ == "m4v" || + out_container_ == "mov" || out_container_ == "mp4")) + { + optimizeFile(filename_noext, log_erase); + } + + MoveFile(filename_noext); + } + else + { + ui_.writeString(" Conversion failed...", true, "yellow"); + + //delete new file (incomplete) + remove(filename_noext.c_str()); + //revert .old... extension: + rename(old_filename.c_str(), important_files_.at(job).c_str()); + + WriteLog(""); + WriteLog("C O N V E R S I O N F A I L E D"); + failed_items++; + } + + remove("/opt/tmp/poisonXprobelist"); + maps_.clear(); targets_.clear(); nr_audio_targets_ = 0; nr_sub_targets_ = 0; nr_video_targets_ = 0; + prev_param_map_.clear(); used_orig_id_.clear(); analyze_.clearEverything(); ui_.writeString("Finished job ", false, "red"); ui_.writeString(important_files_.at(job), true, "red"); - if(settings_.getSettingsParam(DELETESET) == "Yes") + if(settings_.getSettingsParam(DELETESET) == "Yes" && + conversion_success) { - delete_orig.append(old_filename); - delete_orig.append("\" 2>/dev/null"); - system(delete_orig.c_str()); - delete_orig = "rm \""; + remove(old_filename.c_str()); } } if(job != 0) - ui_.writeString("Done :)", true, "green"); + { + if (failed_items == 0) + { + ui_.writeString("Done - all items succeeded! :)", true, "green"); + } + else if (failed_items != job) + { + ui_.writeString("Done - ", false, "green"); + ui_.writeNumber(failed_items, false, "green"); + if (failed_items == 1) + { + ui_.writeString(" item failed! :/", true, "green"); + } + else + { + ui_.writeString(" items failed! :/", true, "green"); + } + } + else + { + ui_.writeString("Done - all items failed! :(", true, "green"); + } + } else + { ui_.writeString("Nothing to be done :p", true, "green"); + } } } -int StartMode::gettingInfos(string& filename) +int StartMode::gettingInfos(string const& filename, string& movie_duration) { string tmp_cmd = "ffprobe -print_format compact \""; - - WriteLog("1. Analyzed File"); - WriteLog(""); tmp_cmd.append(filename); tmp_cmd.append("\" 2> /opt/tmp/poisonXprobelist"); system(tmp_cmd.c_str()); - fileman_.readProperties(filename); + fileman_.readProperties(filename, movie_duration); - WriteLogAnalyze(); + WriteLogAnalyze(SRCVIDEO); + WriteLogAnalyze(SRCAUDIO); + WriteLogAnalyze(SRCSUB); } @@ -291,6 +413,7 @@ int StartMode::applySettings() if (preferences[0] == true && preferences[1] == true && preferences[2] == true && preferences[3] == true && preferences[4] == true) { + maps_.append(" -map 0:"); ss << ((priority_orig - 1) + correcture); maps_.append(ss.str()); @@ -317,7 +440,7 @@ void StartMode::evaluatingTargets(unsigned int priority_wish, unsigned int ident string tmp_param; bool copy_whole_thing = false; - + for (unsigned int target_nr = 1; target_nr <= target_vec_len; target_nr++) { tmp_target_id = vecman_.getTargetIDfromSource(priority_wish, identifier, target_nr); @@ -326,12 +449,15 @@ void StartMode::evaluatingTargets(unsigned int priority_wish, unsigned int ident if (identifier == SRCVIDEO) { out_container_ = vecman_.sendSinglePreference(tmp_target_id, TARVIDEO, 1); - if (out_container_ == "-") + if (out_container_ == "-" || out_container_ == "copy") { out_container_ = analyze_.sendSinglePreference(priority_orig, SRCVIDEO, 1); } + + prev_param_map_["Video"][1] = out_container_; + } - if (identifier == SRCAUDIO) //Codec - Audio + else if (identifier == SRCAUDIO) //Codec - Audio { targets_.append(" -c:a:"); ss << nr_audio_targets_; @@ -339,12 +465,25 @@ void StartMode::evaluatingTargets(unsigned int priority_wish, unsigned int ident ss.str(""); targets_.append(" "); if (tmp_param == "copy") + { copy_whole_thing = true; - if(tmp_param == "-") - tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 1); + } + else if(tmp_param == "-") + { + tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 1); + } + + if (copy_whole_thing) + { + prev_param_map_["Audio"][1] = analyze_.sendSinglePreference(priority_orig, identifier, 1); + } + else + { + prev_param_map_["Audio"][1] = tmp_param; + } targets_.append(tmp_param); } - if (identifier == SRCSUB) + else if (identifier == SRCSUB) { targets_.append(" -c:s:"); ss << nr_sub_targets_; @@ -352,7 +491,16 @@ void StartMode::evaluatingTargets(unsigned int priority_wish, unsigned int ident ss.str(""); targets_.append(" "); targets_.append(tmp_param); - copy_whole_thing = true; + copy_whole_thing = true; //because subtitle has no other parameters! + + if (tmp_param == "copy") + { + prev_param_map_["Subtitle"][1] = analyze_.sendSinglePreference(priority_orig, SRCSUB, 1); + } + else + { + prev_param_map_["Subtitle"][1] = tmp_param; + } } if (copy_whole_thing == false) { @@ -365,7 +513,7 @@ void StartMode::evaluatingTargets(unsigned int priority_wish, unsigned int ident targets_.append(" -c:v:"); ss << nr_video_targets_; } - if (identifier == SRCAUDIO) + else if (identifier == SRCAUDIO) { targets_.append(" -ac:"); ss << nr_audio_targets_; @@ -375,105 +523,163 @@ void StartMode::evaluatingTargets(unsigned int priority_wish, unsigned int ident targets_.append(" "); if (tmp_param == "copy") copy_whole_thing = true; - if((tmp_param == "copy" && identifier != SRCVIDEO) || tmp_param == "-" && identifier == SRCVIDEO) + if((tmp_param == "copy" && identifier != SRCVIDEO) || (tmp_param == "-" && identifier == SRCVIDEO)) { tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 2); } + targets_.append(tmp_param); + + //fill the map: + if (tmp_param == "copy") + { + tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 2); + } + if (identifier == SRCVIDEO) + { + prev_param_map_["Video"][2] = tmp_param; + } + else if (identifier == SRCAUDIO) + { + prev_param_map_["Audio"][2] = tmp_param; + } } - if (copy_whole_thing == false) + } + if (copy_whole_thing == false) + { + //Bitrate at SRCVIDEO or Language at SRCAUDIO + tmp_param = vecman_.sendSinglePreference(tmp_target_id, target_identifier, 3); + if (tmp_param != "-") { - //Bitrate at SRCVIDEO or Language at SRCAUDIO - tmp_param = vecman_.sendSinglePreference(tmp_target_id, target_identifier, 3); - if (tmp_param != "-") + if (identifier == SRCVIDEO) { - if (identifier == SRCVIDEO) - { - targets_.append(" -b:v:"); - ss << nr_video_targets_; - targets_.append(ss.str()); - targets_.append(" "); - } + targets_.append(" -b:v:"); + ss << nr_video_targets_; + targets_.append(ss.str()); + targets_.append(" "); + } + else if (identifier == SRCAUDIO) + { + targets_.append(" -metadata:s:a:"); + ss << nr_audio_targets_; + targets_.append(ss.str()); + targets_.append(" language="); + } + ss.str(""); + if (tmp_param == "copy") + { + tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 3); + } - if (identifier == SRCAUDIO) - { - targets_.append(" -metadata:s:a:"); - ss << nr_audio_targets_; - targets_.append(ss.str()); - targets_.append(" language="); - } - ss.str(""); - if (tmp_param == "copy") - { - tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 3); - } - targets_.append(tmp_param); + targets_.append(tmp_param); + + //fill the map: + if (tmp_param == "copy") + { + tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 3); } - //resolution at SRCVIDEO or Bitrate at SRCAUDIO - tmp_param = vecman_.sendSinglePreference(tmp_target_id, target_identifier, 4); - if (tmp_param != "-") + if (identifier == SRCVIDEO) + { + prev_param_map_["Video"][3] = tmp_param; + } + else if (identifier == SRCAUDIO) + { + prev_param_map_["Audio"][3] = tmp_param; + } + } + + //resolution at SRCVIDEO or Bitrate at SRCAUDIO + tmp_param = vecman_.sendSinglePreference(tmp_target_id, target_identifier, 4); + if (tmp_param != "-") + { + if (identifier == SRCVIDEO) + { + targets_.append(" -s:v:"); + ss << nr_video_targets_; + } + if (identifier == SRCAUDIO) { - if (identifier == SRCVIDEO) - { - targets_.append(" -s:v:"); - ss << nr_video_targets_; - } - if (identifier == SRCAUDIO) - { targets_.append(" -b:a:"); ss << nr_audio_targets_; - } - targets_.append(ss.str()); - ss.str(""); - targets_.append(" "); - if (tmp_param == "copy") - { - tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 4); - } - targets_.append(tmp_param); } + targets_.append(ss.str()); + ss.str(""); + targets_.append(" "); + if (tmp_param == "copy") + { + tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 4); + } + targets_.append(tmp_param); + + //fill the map: + if (tmp_param == "copy") + { + tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 4); + } + if (identifier == SRCVIDEO) + { + prev_param_map_["Video"][4] = tmp_param; + } + else if (identifier == SRCAUDIO) + { + prev_param_map_["Audio"][4] = tmp_param; + } + } + + //fps at SRCVIDEO, sample rate at SRCAUDIO + tmp_param = vecman_.sendSinglePreference(tmp_target_id, target_identifier, 5); + if (tmp_param != "-") + { + if (identifier == SRCVIDEO) + { + targets_.append(" -r:v:"); + ss << nr_video_targets_; + } + if (identifier == SRCAUDIO) + { + targets_.append(" -ar:"); + ss << nr_audio_targets_ + nr_video_targets_; + } + targets_.append(ss.str()); + ss.str(""); + targets_.append(" "); + if (tmp_param == "copy") + { + tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 5); + } + targets_.append(tmp_param); - //fps at SRCVIDEO, sample rate at SRCAUDIO - tmp_param = vecman_.sendSinglePreference(tmp_target_id, target_identifier, 5); - if (tmp_param != "-") + //fill the map: + if (tmp_param == "copy") { - if (identifier == SRCVIDEO) - { - targets_.append(" -r:v:"); - ss << nr_video_targets_; - } - if (identifier == SRCAUDIO) - { - targets_.append(" -ar:"); - ss << nr_audio_targets_ + nr_video_targets_; - } - targets_.append(ss.str()); - ss.str(""); - targets_.append(" "); - if (tmp_param == "copy") - { - tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 5); - } - targets_.append(tmp_param); + tmp_param = analyze_.sendSinglePreference(priority_orig, identifier, 5); + } + if (identifier == SRCVIDEO) + { + prev_param_map_["Video"][5] = tmp_param; + } + else if (identifier == SRCAUDIO) + { + prev_param_map_["Audio"][5] = tmp_param; } } } - if(identifier == SRCVIDEO) - nr_video_targets_++; - if(identifier == SRCAUDIO) - nr_audio_targets_++; - if(identifier == SRCSUB) - nr_sub_targets_++; } + + if(identifier == SRCVIDEO) + nr_video_targets_++; + if(identifier == SRCAUDIO) + nr_audio_targets_++; + if(identifier == SRCSUB) + nr_sub_targets_++; + } void StartMode::optimizeFile(string& filename, string erase_log) { string new_filename = "\""; string filename_no_ext; - string qt_start = "qt-faststart \""; //"qtfaststart" for OS X? - string remove = "rm \""; - string rename = "mv "; + string qt_start = "qt-faststart \""; unsigned int position; ui_.writeString(" Started optimizing...", true, "yellow"); @@ -495,16 +701,8 @@ void StartMode::optimizeFile(string& filename, string erase_log) system(qt_start.c_str()); - remove.append(filename); - remove.append("\" 2>/dev/null"); - system(remove.c_str()); - - rename.append(new_filename); - rename.append("\" \""); - rename.append(filename); - rename.append("\" 2>/dev/null"); - - system(rename.c_str()); + remove(filename.c_str()); + rename(new_filename.c_str(), filename.c_str()); ui_.writeString(" Finished optimizing...", true, "yellow"); } @@ -533,71 +731,79 @@ void StartMode::WriteLogHeader(int job) WriteLog(""); } -void StartMode::WriteLogAnalyze() +void StartMode::WriteLogAnalyze(unsigned int identifier) { string output; - string tmp_param[5] = { " Video: Container ", - " Codec ", - " Bitrate ", - " Resolution ", - " Fps "}; + string tmp_param[5] = {""}; - for(int i=0; i<5; i++) + if (identifier == SRCVIDEO) { - try - { - output = tmp_param[i]; - output.append(analyze_.sendSinglePreference(1, SRCVIDEO, i + 1)); - WriteLog(output); - } - catch (exception) + tmp_param[0] = " Video: Container "; + tmp_param[1] = " Codec "; + tmp_param[2] = " Bitrate "; + tmp_param[3] = " Resolution "; + tmp_param[4] = " Fps "; + + for(int i=0; i<5; i++) { - output.append("-"); - WriteLog(output); + try + { + output = tmp_param[i]; + output.append(analyze_.sendSinglePreference(1, SRCVIDEO, i + 1)); + WriteLog(output); + } + catch (exception) + { + output.append("-"); + WriteLog(output); + } } } - - WriteLog(""); - tmp_param[0] = " Audio: Codec "; - tmp_param[1] = " Channels "; - tmp_param[2] = " Language "; - tmp_param[3] = " Bitrate "; - tmp_param[4] = " Sample Rate "; - - for (int i = 0; i < 5; i++) + else if (identifier == SRCAUDIO) { - try - { - output = tmp_param[i]; - output.append(analyze_.sendSinglePreference(1, SRCAUDIO, i + 1)); - WriteLog(output); - } - catch(exception) + tmp_param[0] = " Audio: Codec "; + tmp_param[1] = " Channels "; + tmp_param[2] = " Language "; + tmp_param[3] = " Bitrate "; + tmp_param[4] = " Sample Rate "; + + for (int i = 0; i < 5; i++) { - output.append("-"); - WriteLog(output); + try + { + output = tmp_param[i]; + output.append(analyze_.sendSinglePreference(1, SRCAUDIO, i + 1)); + WriteLog(output); + } + catch(exception) + { + output.append("-"); + WriteLog(output); + } } } - - WriteLog(""); - tmp_param[0] = " Subtitles: Codec "; - tmp_param[1] = " Language "; - - for(int i=0; i<2; i++) + else if (identifier == SRCSUB) { - try - { - output = tmp_param[i]; - output.append(analyze_.sendSinglePreference(1, SRCSUB, i + 1)); - WriteLog(output); - } - catch(exception) + tmp_param[0] = " Subtitles: Codec "; + tmp_param[1] = " Language "; + + for(int i=0; i<2; i++) { - output.append("-"); - WriteLog(output); + try + { + output = tmp_param[i]; + output.append(analyze_.sendSinglePreference(1, SRCSUB, i + 1)); + WriteLog(output); + } + catch(exception) + { + output.append("-"); + WriteLog(output); + } } } WriteLog(""); + } void StartMode::WriteLogFfmpeg(string ffmpeg_cmd) @@ -629,16 +835,93 @@ void StartMode::WriteLogOptimize() WriteLog(""); } -void StartMode::MoveFile(string filename) + +void StartMode::MoveFile(string filename_full_path) { string move_file = "mv \""; + string movie_destination = settings_.getSettingsParam(DESTINATION); + string filename_without_path = filename_full_path.substr(filename_full_path.find_last_of("/")); - move_file.append(settings_.getSettingsParam(MOVIEPATH)); - move_file.append(filename); + move_file.append(filename_full_path); move_file.append("\" \""); - move_file.append(settings_.getSettingsParam(DESTINATION)); - move_file.append(filename); - move_file.append("\""); + move_file.append(movie_destination.substr(0, movie_destination.size() - 1)); + move_file.append(filename_without_path); + move_file.append("\" 2>/dev/null"); system(move_file.c_str()); -} \ No newline at end of file +} + +bool StartMode::checkForConversionSuccess(int ffmpeg_response, + string const& path_to_file) +{ + string new_movie_duration; + + //checking response of ffmpeg: + if (ffmpeg_response != 0) + { + return false; + } + + WriteLog(""); + WriteLog("4. Analyzed processed file"); + WriteLog(""); + analyze_.clearEverything(); + gettingInfos(path_to_file, new_movie_duration); + + //check duration: + if (movie_duration_ != new_movie_duration) + { + return false; + } + + //check stream parameter: + for(int i=0; i<5; i++) + { + try + { + //this will throw if param is "-": + string should_output = analyze_.sendSinglePreference(1, SRCVIDEO, i + 1); + if (prev_param_map_.at("Video").at(i+1) != should_output) + { + return false; + } + } + catch (exception) + { + + } + } + for(int i=0; i<5; i++) + { + try + { + //this will throw if param is "-": + string should_output = analyze_.sendSinglePreference(1, SRCAUDIO, i + 1); + if (prev_param_map_.at("Audio").at(i+1) != should_output) + { + return false; + } + } + catch (exception) + { + + } + } + + try + { + //this will throw if param is "-": + string should_output = analyze_.sendSinglePreference(1, SRCSUB, 1); + if (prev_param_map_.at("Subtitle").at(1) != should_output) + { + return false; + } + } + catch (exception) + { + + } + + WriteLog("C O N V E R S I O N S U C C E E D E D"); + return true; +} diff --git a/StartMode.h b/StartMode.h index cb19033..378d042 100755 --- a/StartMode.h +++ b/StartMode.h @@ -1,9 +1,21 @@ -/* - * File: StartMode.h - * Author: CutePoisonX - * - * Created on 10. Februar 2013, 10:02 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef STARTMODE_H #define STARTMODE_H @@ -15,6 +27,7 @@ #include "SettingsMode.h" #include +#include using namespace std; @@ -32,24 +45,28 @@ class StartMode : public Mode{ private: //---------------------------------------------------------------------------- - VectorSourceManager& vecman_; - FileManager& fileman_; - vector important_files_; - SettingsMode& settings_; - vector used_orig_id_; - AnalyzeMedia& analyze_; + VectorSourceManager& vecman_; + FileManager& fileman_; + vector important_files_; + SettingsMode& settings_; + vector used_orig_id_; + AnalyzeMedia& analyze_; - string targets_; - string maps_; - string out_container_; - string logfile_; - unsigned int nr_video_targets_; - unsigned int nr_audio_targets_; - unsigned int nr_sub_targets_; + string movie_duration_; + string targets_; + string maps_; + string out_container_; + string logfile_; + unsigned int nr_video_targets_; + unsigned int nr_audio_targets_; + unsigned int nr_sub_targets_; + + map > prev_param_map_; //---------------------------------------------------------------------------- + int listDirectory(string dir, vector& files_of_interest); int gettingFiles(); - int gettingInfos(string& filename); + int gettingInfos(string const& filename, string& movie_duration); int applySettings(); void evaluatingTargets(unsigned int priority_wish, @@ -58,10 +75,11 @@ class StartMode : public Mode{ void optimizeFile(string& filename, string erase_log); void WriteLog(string message); void WriteLogHeader(int job); - void WriteLogAnalyze(); + void WriteLogAnalyze(unsigned int identifier); void WriteLogFfmpeg(string ffmpeg_cmd); void WriteLogOptimize(); - void MoveFile(string filename); + void MoveFile(string filename_full_path); + bool checkForConversionSuccess(int ffmpeg_response, string const& path_to_file); }; #endif /* STARTMODE_H */ diff --git a/StreamPreference.cpp b/StreamPreference.cpp index 83416df..5c0e281 100755 --- a/StreamPreference.cpp +++ b/StreamPreference.cpp @@ -1,9 +1,21 @@ -/* - * File: StreamPreference.cpp - * Author: CutePoisonX - * - * Created on 04. Februar 2013, 09:40 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "StreamPreference.h" diff --git a/StreamPreference.h b/StreamPreference.h index ed24b21..8b4da1e 100755 --- a/StreamPreference.h +++ b/StreamPreference.h @@ -1,9 +1,21 @@ -/* - * File: StreamPreference.h - * Author: CutePoisonX - * - * Created on 04. Februar 2013, 09:40 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef STREAMPREFERENCE_H #define STREAMPREFERENCE_H diff --git a/UserInterface.cpp b/UserInterface.cpp index be0dde0..72c8322 100755 --- a/UserInterface.cpp +++ b/UserInterface.cpp @@ -1,9 +1,22 @@ -/* - * File: StreamPreference.cpp - * Author: CutePoisonX - * - * Created on 04. Februar 2013, 10:41 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// + #include #include #include diff --git a/UserInterface.h b/UserInterface.h index 2d8c2ae..5bbbf9b 100755 --- a/UserInterface.h +++ b/UserInterface.h @@ -1,9 +1,21 @@ -/* - * File: UserInterface.h - * Author: CutePoisonX - * - * Created on 04. Februar 2013, 09:38 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef USERINTERFACE_H #define USERINTERFACE_H diff --git a/VectorManager.cpp b/VectorManager.cpp index d354dad..5cfe19f 100755 --- a/VectorManager.cpp +++ b/VectorManager.cpp @@ -1,9 +1,21 @@ -/* - * File: VectorManager.cpp - * Author: CutePoisonX - * - * Created on 10. Februar 2013, 10:31 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "VectorManager.h" #include @@ -59,4 +71,4 @@ string VectorManager::sendSinglePreference(unsigned int priority, unsigned int VectorManager::getVectorLen(unsigned int identifier) { return getVector(identifier).size(); -} \ No newline at end of file +} diff --git a/VectorManager.h b/VectorManager.h index 11119e9..9a609f2 100755 --- a/VectorManager.h +++ b/VectorManager.h @@ -1,9 +1,21 @@ -/* - * File: VectorManager.h - * Author: CutePoisonX - * - * Created on 10. Februar 2013, 10:31 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef VECTORMANAGER_H #define VECTORMANAGER_H diff --git a/VectorSourceManager.cpp b/VectorSourceManager.cpp index 0b782a7..548a93f 100755 --- a/VectorSourceManager.cpp +++ b/VectorSourceManager.cpp @@ -1,9 +1,21 @@ -/* - * File: VectorManager.cpp - * Author: CutePoisonX - * - * Created on 03. Februar 2013, 23:28 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "VectorSourceManager.h" @@ -192,4 +204,4 @@ void VectorSourceManager::clearAllInstances() delete source_sub_vect_.at(index); } source_sub_vect_.clear(); -} \ No newline at end of file +} diff --git a/VectorSourceManager.h b/VectorSourceManager.h index 3fe4b64..e26826f 100755 --- a/VectorSourceManager.h +++ b/VectorSourceManager.h @@ -1,9 +1,21 @@ -/* - * File: VectorManager.h - * Author: CutePoisonX - * - * Created on 03. Februar 2013, 23:28 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef VECTORSOURCEMANAGER_H #define VECTORSOURCEMANAGER_H diff --git a/YesNoSetting.cpp b/YesNoSetting.cpp index e5445fe..8375eec 100644 --- a/YesNoSetting.cpp +++ b/YesNoSetting.cpp @@ -1,9 +1,21 @@ -/* - * File: YesNoSetting.cpp - * Author: CutePoisonX - * - * Created on 16. Juni 2013, 22:12 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include "YesNoSetting.h" #include "UserInterface.h" diff --git a/YesNoSetting.h b/YesNoSetting.h index 9e07a6f..5192f81 100644 --- a/YesNoSetting.h +++ b/YesNoSetting.h @@ -1,9 +1,21 @@ -/* - * File: YesNoSetting.h - * Author: CutePoisonX - * - * Created on 16. Juni 2013, 22:12 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #ifndef YESNOSETTING_H #define YESNOSETTING_H diff --git a/main.cpp b/main.cpp index d929c9f..81cfbc4 100755 --- a/main.cpp +++ b/main.cpp @@ -1,9 +1,21 @@ -/* - * File: main.cpp - * Author: CutePoisonX - * - * Created on 03. Februar 2013, 23:23 - */ +// +// Copyright 2014 CutePoisonX (CutePoisonXI@gmail.com) +// +// This file is part of PoisonConvert. +// +// PoisonConvert is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// PoisonConvert is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with PoisonConvert. If not, see . +// #include #include @@ -21,7 +33,7 @@ using namespace std; -const string version = "Version: 1.3"; +const string version = "Version: 1.4"; int main(int argc, char** argv) { @@ -210,7 +222,7 @@ int main(int argc, char** argv) filemanager.readPreferences(); } catch (OpenFileException) { - ui.writeString("Created config-file.", true, "red"); + ui.writeString("Attention: Config file empty or not created (this is normal if you specified a new config-file. Just create some configurations).", true, "red"); ui.readString(false); } catch (exception) {