Packman Build Service PMBS

Changes of Revision 4

screengen.changes Changed

screengen.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package screengen
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,22 +16,24 @@
 #
 
 
-%define dversion    20130901
+%define bversion    20140909
 
 Name:           screengen
-Version:        1.7
+Version:        1.8
 Release:        0
 License:        GPL-3.0
 Summary:        Screenlist Generator
 Url:            http://qt-apps.org/content/show.php/ScreenGen+-+Screenlist+generator?content=153485
 Group:          Productivity/Multimedia/Video/Players
-Source0:        http://www.kochkin.org/lib/exe/fetch.php/%{name}/%{name}-%{version}-%{dversion}.tar.bz2
+Source0:        http://www.kochkin.org/lib/exe/fetch.php/%{name}/%{name}-%{version}-%{bversion}.tar.bz2
 BuildRequires:  pkgconfig(QtCore) >= 4.8
 BuildRequires:  pkgconfig(QtGui) >= 4.8
 BuildRequires:  pkgconfig(libavcodec)
 BuildRequires:  pkgconfig(libavformat)
 BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  pkgconfig(libswscale)
+# The program use it by default.
+Requires:       liberation-fonts
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -42,6 +44,8 @@
 
 %prep
 %setup -qn %{name}
+# Avoid /usr/bin/perl dependency.
+chmod -x example-scripts/screengen-*
 
 %build
 qmake \
@@ -55,7 +59,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG COPYRIGHT
+%doc CHANGELOG COPYING example-scripts/
 %{_bindir}/%{name}
 %{_datadir}/%{name}/

screengen-1.7-20130901.tar.bz2/COPYRIGHT Deleted

screengen-1.7-20130901.tar.bz2/CHANGELOG -> screengen-1.8-20140909.tar.bz2/CHANGELOG Changed

screengen-1.8-20140909.tar.bz2/COPYING Added

@@ -0,0 +1,692 @@
+Copyright (C) 2012-2014 Oleg Kochkin <oleg.kochkin@gmail.com>, www.kochkin.tk.
+License GPL.
+
+------------------------------------------------------------------------------
+    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 <http://www.gnu.org/licenses/>.
+------------------------------------------------------------------------------
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ 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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <http://www.gnu.org/licenses/>.
+
+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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<http://www.gnu.org/licenses/>.
+
+  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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

screengen-1.7-20130901.tar.bz2/INSTALL -> screengen-1.8-20140909.tar.bz2/INSTALL Changed

screengen-1.8-20140909.tar.bz2/example-scripts/screengen-file Added

screengen-1.8-20140909.tar.bz2/example-scripts/screengen-folder Added

@@ -0,0 +1,39 @@
+#!/usr/bin/perl
+
+# Create lists for all video files in folder
+# Parameter: "FolderWithVideoFiles"
+# Example: screengen "/mnt/stor/video"
+# Lists saved in "/mnt/stor/video/scr" folder
+
+$folder="@ARGV[0]"."/";
+$outfolder="$folder"."scr";
+
+$presets1=`screengen --presetsList`;
+@presets=split ("\n",$presets1);
+
+$all_presets="";
+
+for ($i=3;$i<@presets;$i++){
+  $all_presets=$all_presets." \"".@presets[$i]."\" \"".@presets[$i]."\"";
+  }
+$selected=`kdialog --title "Select preset for screengen." --menu "Preset" $all_presets`;
+if ($selected eq "") {exit;}
+
+chomp $selected;
+
+@files=`ls "$folder" -1`;
+
+foreach $file (@files){
+  chomp $file;
+  $filename="$folder"."$file";
+  $vid=`xdg-mime query filetype "$filename"`;
+  if ((split ("/", $vid))[0] eq "video") {
+    if (-e "$outfolder"){}
+    else {mkdir ("$outfolder");}
+
+    $cmd="nice -n 19 screengen \"$filename\" --preset \"$selected\" --outFolder \"$outfolder\"";
+    `$cmd`;
+	}
+  }
+
+`kdialog --title "Done create lists in folder." --msgbox "$folder\nwith preset $selected"`;

screengen-1.8-20140909.tar.bz2/example-scripts/screengen-folder.desktop Added

screengen-1.8-20140909.tar.bz2/example-scripts/screengen.desktop Added

screengen-1.7-20130901.tar.bz2/screengen_ru_RU.ts -> screengen-1.8-20140909.tar.bz2/screengen_ru_RU.ts Changed

@@ -4,63 +4,63 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/main.cpp" line="338"/>
+        <location filename="src/main.cpp" line="394"/>
         <source>Mb</source>
         <translation>Мб</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="358"/>
+        <location filename="src/main.cpp" line="414"/>
         <source>File name:</source>
         <translation>Имя файла:</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="360"/>
+        <location filename="src/main.cpp" line="416"/>
         <source>Size:</source>
         <translation>Размер:</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="362"/>
+        <location filename="src/main.cpp" line="418"/>
         <source>General info:</source>
         <translation>Информация:</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="364"/>
+        <location filename="src/main.cpp" line="420"/>
         <source>Video:</source>
         <translation>Видео:</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="366"/>
+        <location filename="src/main.cpp" line="422"/>
         <source>Audio:</source>
         <translation>Аудио:</translation>
     </message>
     <message>
-        <location filename="src/qffmpeg.cpp" line="15"/>
-        <location filename="src/qffmpeg.cpp" line="100"/>
+        <location filename="src/qffmpeg.cpp" line="29"/>
+        <location filename="src/qffmpeg.cpp" line="152"/>
         <source>kb/s</source>
         <translation>кбит/с</translation>
     </message>
     <message>
-        <location filename="src/qffmpeg.cpp" line="15"/>
+        <location filename="src/qffmpeg.cpp" line="29"/>
         <source>Streams:</source>
         <translation>Потоков:</translation>
     </message>
     <message>
-        <location filename="src/qffmpeg.cpp" line="15"/>
+        <location filename="src/qffmpeg.cpp" line="29"/>
         <source>Full bitrate:</source>
         <translation>Общий битрейт:</translation>
     </message>
     <message>
-        <location filename="src/qffmpeg.cpp" line="92"/>
+        <location filename="src/qffmpeg.cpp" line="144"/>
         <source>fps</source>
         <translation>кадров/с</translation>
     </message>
     <message>
-        <location filename="src/qffmpeg.cpp" line="101"/>
+        <location filename="src/qffmpeg.cpp" line="153"/>
         <source>kHz</source>
         <translation>кГц</translation>
     </message>
     <message>
-        <location filename="src/qffmpeg.cpp" line="103"/>
+        <location filename="src/qffmpeg.cpp" line="155"/>
         <source>Not present</source>
         <translation>Отсутствует</translation>
     </message>

screengen-1.8-20140909.tar.bz2/src/build_number.h Added

screengen-1.7-20130901.tar.bz2/src/main.cpp -> screengen-1.8-20140909.tar.bz2/src/main.cpp Changed

@@ -1,5 +1,8 @@
+#include "build_number.h"
+#define VERSION VERSION_NUMBER"-"BUILD_NUMBER
+#define COPYRIGHT "ScreenGen. Version "VERSION_NUMBER" (build "BUILD_NUMBER"). Copyright (C) 2012-2014 Oleg Kochkin (www.kochkin.tk). License - GPL."
+
 #include <QApplication>
-#include <QDebug>
 #include <QPainter>
 #include <QTime>
 #include <QTextCodec>
@@ -8,6 +11,7 @@
 #include <QSettings>
 #include "qffmpeg.h"
 #include "qshadow.h"
+#include <QTextStream>
 
 QColor getColorFromString (QString tc);
 int fontWeightFromString (QString w, int def);
@@ -20,7 +24,7 @@
 	translator.load ("screengen_"+QLocale::system().name()+".qm","/usr/share/screengen/translations/");
 	app.installTranslator (&translator);
 
-	qDebug()<<"Screenlist generator from video file. Version 1.7. Copyright (C) 2012,2013 Oleg Kochkin. License - GPL.";
+	QTextStream(stdout)<<COPYRIGHT<<"\n"<<endl;
 // Видеофайл
 	QString videoFile = "";
 // Секция предустановок
@@ -87,6 +91,10 @@
 	QString stampDescrPos=cfg.value ("stampDescrPos","lt").toString();
 	QString stampDescr=cfg.value ("stampDescr","").toString();// Комментарий
 	QString timeStep=cfg.value ("timeStep","00:00:00").toString();// Время между кадрами
+	int maxRows=cfg.value ("maxRows",50).toInt();// Максимальное количество строк при использовании --timeStep
+	bool version=cfg.value ("version",false).toBool();// Строка авторских прав в нижней части листа
+	QString stampStart=cfg.value ("stampStart","00:00:00").toString();// Начальное время дла штампа времени
+	bool stampStartFlag = false;
 	
 	cfg.setValue ("frames",frames);
 	cfg.setValue ("width",widthList);
@@ -120,6 +128,7 @@
 	cfg.setValue ("foreground",foreground);
 	cfg.setValue ("aspect",aspect);
 	cfg.setValue ("stampPos",stampPos);
+	cfg.setValue ("stampStart",stampStart);
 	cfg.setValue ("infoShadowOffset",infoShadowOffset);
 	cfg.setValue ("infoShadowInt",infoShadowInt);
 	cfg.setValue ("infoShadowColor",infoShadowColor);
@@ -138,6 +147,8 @@
 	cfg.setValue ("stampDescrPos",stampDescrPos);
 	cfg.setValue ("stampDescr",stampDescr);
 	cfg.setValue ("timeStep",timeStep);
+	cfg.setValue ("maxRows",maxRows);
+	cfg.setValue ("version",version);
 	cfg.endGroup();
 		
 	videoFile = argv[1];
@@ -190,11 +201,21 @@
 	if (QString(argv[i]) == "--presetsList") presetsList=true;
 	if (QString(argv[i]) == "--presetInfo") presetInfo=QString(argv[i+1]);
 	if (QString(argv[i]) == "--timeStep") timeStep=QString(argv[i+1]);
+	if (QString(argv[i]) == "--maxRows") maxRows=QString(argv[i+1]).toInt();
+
+	if (QString(argv[i]) == "--stampStart")	{
+		stampStart=QString(argv[i+1]);
+		stampStartFlag = true;
+		}
 
 	if (QString(argv[i]) == "--header") {
 		if (QString(argv[i+1]) == "true") header=true;
 		else header=false;
 		}
+	if (QString(argv[i]) == "--version") {
+		if (QString(argv[i+1]) == "true") version=true;
+		else version=false;
+		}
 	if (QString(argv[i]) == "--timeFrame") {
 		if (QString(argv[i+1]) == "true") timeFrame=true;
 		else timeFrame=false;
@@ -210,80 +231,83 @@
 	}
 
 	if (presetsList){
-		qDebug()<<"Presets in "<<cfg.fileName()<<":";
+		QTextStream(stdout)<<"Presets in "<<cfg.fileName()<<":\n";
 		QStringList presets = cfg.childGroups();
-		foreach (QString preset, presets) qDebug()<<preset;
+		foreach (QString preset, presets) QTextStream(stdout)<<preset<<"\n";
 		return 0;
 		}
 		
 	if (! presetInfo.isEmpty()){
-		qDebug()<<"Values in preset"<<presetInfo<<"in file"<<cfg.fileName()<<":";
+		QTextStream(stdout)<<"Values in preset "<<presetInfo<<" in file "<<cfg.fileName()<<":\n";
 		cfg.beginGroup(presetInfo);
 		QStringList preset = cfg.childKeys();
 		foreach (QString key, preset){
 			QString str = key+" = "+ cfg.value(key,"").toString();
-			qDebug()<<str;
+			QTextStream(stdout)<<str<<"\n";
 			}
 		cfg.endGroup();
 		return 0;
 		}
 
 	if (argc < 2){
-		qDebug()<<"screengen videoFile [parameters]";
-		qDebug()<<"Parameters:";
-		qDebug()<<"   --preset                  Use section in config file (default - \"Default\")";
-		qDebug()<<"   --presetsList             Show all presets in config file (all other parameters ignored)";
-		qDebug()<<"   --presetInfo              Show all values in preset (all other parameters ignored, example: --presetInfo MyPreset)";
-		qDebug()<<"   --frames                  Frames count in screenlist (default - 16)";
-		qDebug()<<"   --width                   Width screenlist (default - 1200)";
-		qDebug()<<"   --horCount                Frames in horisontal (default - 4)";
-		qDebug()<<"   --offsetBegin             Time offset from begin (default - \"00:01:00\")";
-		qDebug()<<"   --offsetEnd               Time offset from end (default - \"00:01:00\")";
-		qDebug()<<"   --listBorder              Depth border screenlist (default - 10)";
-		qDebug()<<"   --frameBorder             Depth border frame (default - 5)";
-		qDebug()<<"   --shadowOffset            Offset shadow of frame (default - 5)";
-		qDebug()<<"   --shadowInt               Intensity shadow of frame (default - 10, range 0-100)";
-		qDebug()<<"   --shadowColor             R,G,B color shadow of frame (default - \"0,0,0\" - black, \"255,255,255\" - white)";
-		qDebug()<<"   --background              Picture file for background (if empty, fill white)";
-		qDebug()<<"   --backgroundColor         R,G,B[,A] background color (default - \"255,255,255\")";
-		qDebug()<<"   --picType                 Type of picture file (default - \"jpg\")";
-		qDebug()<<"   --header                  Header with information (default - true)";
-		qDebug()<<"   --timeFrame               Time stamp on frame (default - true)";
-		qDebug()<<"   --fontFrameName           Name font on frame (default - \"Liberation Sans\")";
-		qDebug()<<"   --fontFrameSize           Size font on frame (default - 10)";
-		qDebug()<<"   --fontFrameWeight         Weight font on frame (default - Normal, (Light,DemiBold,Bold,Black))";
-		qDebug()<<"   --fontFrameItalic         Italic font on frame (default - false)";
-		qDebug()<<"   --fontFrameColor          R,G,B[,A] color font on frame (default - \"255,255,255\")";
-		qDebug()<<"   --fontFrameShadowOffset   Offset shadow of time stamp (default - 0)";
-		qDebug()<<"   --fontFrameShadowInt      Intensity shadow of time stamp (default - 2, range 0-100)";
-		qDebug()<<"   --fontFrameShadowColor    R,G,B color shadow of time stamp (default - \"0,0,0\")";
-		qDebug()<<"   --stampPos                Position time stamp (default - \"rb\" (RightBottom), (rb, rt, lb, lr))";
-		qDebug()<<"   --stampOffset             Offset from the edge of the frame to the timestamp (default - 3)";
-		qDebug()<<"   --fontHeaderName          Name font on header (default - \"Liberation Sans\")";
-		qDebug()<<"   --fontHeaderSize          Size font on header (default - 13)";
-		qDebug()<<"   --fontHeaderWeight        Weight font on header (default - Bold, (Normal,Light,DemiBold,Black))";
-		qDebug()<<"   --fontHeaderItalic        Italic font on header (default - false)";
-		qDebug()<<"   --fontHeaderColor         R,G,B[,A] color font on header (default - \"0,0,0\")";
-		qDebug()<<"   --headerBackground        Picture file for header background (if empty, default color for header)";
-		qDebug()<<"   --headerColor             R,G,B[,A] color header background (default - \"255,255,255\")";
-		qDebug()<<"   --headerBorderColor       R,G,B[,A] color header border (default - \"0,0,0\")";
-		qDebug()<<"   --headerBorder            Depth border header (default - 2)";
-		qDebug()<<"   --infoShadowOffset        Offset shadow of information text (default - 5)";
-		qDebug()<<"   --infoShadowInt           Intensity shadow of information text (default - 10, range 0-100)";
-		qDebug()<<"   --infoShadowColor         R,G,B color shadow of information text (default - \"100,100,100\")";
-		qDebug()<<"   --logoFile                Picture file for logotype (it is recommended PNG image with alpha channel)";
-		qDebug()<<"   --logoShadowOffset        Offset shadow of logotype (default - 5)";
-		qDebug()<<"   --logoShadowInt           Intensity shadow of logotype (default - 10, range 0-100)";
-		qDebug()<<"   --logoShadowColor         R,G,B color shadow of logotype (default - \"100,100,100\")";
-		qDebug()<<"   --foreground              Picture file for foreground (it is recommended PNG image with alpha channel)";
-		qDebug()<<"   --aspect                  Aspect ratio (if 0.0 - source aspect, default - 0.0)";
-		qDebug()<<"   --descr                   Custom text, located at the top of the header";
-		qDebug()<<"   --outFolder               Folder for result files";
-		qDebug()<<"   --frameBoxColor           R,G,B[,A] color frame border (default - \"120,120,120\")";
-		qDebug()<<"   --frameBox                Depth border frame (default - 0)";
-		qDebug()<<"   --stampDescr              Custom text, located on frame";
-		qDebug()<<"   --stampDescrPos           Position custom text (default - \"lt\" (LeftTop), (rb, rt, lb, lr))";
-		qDebug()<<"   --timeStep                The time between frames. If not equal to \"00:00:00\", the parameter \"frames\" are ignored. (default - \"00:00:00\")";
+		QTextStream(stdout)<<"screengen videoFile [parameters]\n";
+		QTextStream(stdout)<<"Parameters:\n";
+		QTextStream(stdout)<<"   --preset                  Use section in config file (default - \"Default\")\n";
+		QTextStream(stdout)<<"   --presetsList             Show all presets in config file (all other parameters ignored)\n";
+		QTextStream(stdout)<<"   --presetInfo              Show all values in preset (all other parameters ignored, example: --presetInfo MyPreset)\n";
+		QTextStream(stdout)<<"   --frames                  Frames count in screenlist (default - 16)\n";
+		QTextStream(stdout)<<"   --width                   Width screenlist (default - 1200)\n";
+		QTextStream(stdout)<<"   --horCount                Frames in horisontal (default - 4)\n";
+		QTextStream(stdout)<<"   --offsetBegin             Time offset from begin (default - \"00:01:00\")\n";
+		QTextStream(stdout)<<"   --offsetEnd               Time offset from end (default - \"00:01:00\")\n";
+		QTextStream(stdout)<<"   --listBorder              Depth border screenlist (default - 10)\n";
+		QTextStream(stdout)<<"   --frameBorder             Depth border frame (default - 5)\n";
+		QTextStream(stdout)<<"   --shadowOffset            Offset shadow of frame (default - 5)\n";
+		QTextStream(stdout)<<"   --shadowInt               Intensity shadow of frame (default - 10, range 0-100)\n";
+		QTextStream(stdout)<<"   --shadowColor             R,G,B color shadow of frame (default - \"0,0,0\" - black, \"255,255,255\" - white)\n";
+		QTextStream(stdout)<<"   --background              Picture file for background (if empty, fill white)\n";
+		QTextStream(stdout)<<"   --backgroundColor         R,G,B[,A] background color (default - \"255,255,255\")\n";
+		QTextStream(stdout)<<"   --picType                 Type of picture file (default - \"jpg\")\n";
+		QTextStream(stdout)<<"   --header                  Header with information (default - true)\n";
+		QTextStream(stdout)<<"   --timeFrame               Time stamp on frame (default - true)\n";
+		QTextStream(stdout)<<"   --fontFrameName           Name font on frame (default - \"Liberation Sans\")\n";
+		QTextStream(stdout)<<"   --fontFrameSize           Size font on frame (default - 10)\n";
+		QTextStream(stdout)<<"   --fontFrameWeight         Weight font on frame (default - Normal, (Light,DemiBold,Bold,Black))\n";
+		QTextStream(stdout)<<"   --fontFrameItalic         Italic font on frame (default - false)\n";
+		QTextStream(stdout)<<"   --fontFrameColor          R,G,B[,A] color font on frame (default - \"255,255,255\")\n";
+		QTextStream(stdout)<<"   --fontFrameShadowOffset   Offset shadow of time stamp (default - 0)\n";
+		QTextStream(stdout)<<"   --fontFrameShadowInt      Intensity shadow of time stamp (default - 2, range 0-100)\n";
+		QTextStream(stdout)<<"   --fontFrameShadowColor    R,G,B color shadow of time stamp (default - \"0,0,0\")\n";
+		QTextStream(stdout)<<"   --stampPos                Position time stamp (default - \"rb\" (RightBottom), (rb, rt, lb, lr))\n";
+		QTextStream(stdout)<<"   --stampOffset             Offset from the edge of the frame to the timestamp (default - 3)\n";
+		QTextStream(stdout)<<"   --stampStart              Time offset for timestamp (default - \"00:00:00\")\n";
+		QTextStream(stdout)<<"   --fontHeaderName          Name font on header (default - \"Liberation Sans\")\n";
+		QTextStream(stdout)<<"   --fontHeaderSize          Size font on header (default - 13)\n";
+		QTextStream(stdout)<<"   --fontHeaderWeight        Weight font on header (default - Bold, (Normal,Light,DemiBold,Black))\n";
+		QTextStream(stdout)<<"   --fontHeaderItalic        Italic font on header (default - false)\n";
+		QTextStream(stdout)<<"   --fontHeaderColor         R,G,B[,A] color font on header (default - \"0,0,0\")\n";
+		QTextStream(stdout)<<"   --headerBackground        Picture file for header background (if empty, default color for header)\n";
+		QTextStream(stdout)<<"   --headerColor             R,G,B[,A] color header background (default - \"255,255,255\")\n";
+		QTextStream(stdout)<<"   --headerBorderColor       R,G,B[,A] color header border (default - \"0,0,0\")\n";
+		QTextStream(stdout)<<"   --headerBorder            Depth border header (default - 2)\n";
+		QTextStream(stdout)<<"   --infoShadowOffset        Offset shadow of information text (default - 5)\n";
+		QTextStream(stdout)<<"   --infoShadowInt           Intensity shadow of information text (default - 10, range 0-100)\n";
+		QTextStream(stdout)<<"   --infoShadowColor         R,G,B color shadow of information text (default - \"100,100,100\")\n";
+		QTextStream(stdout)<<"   --logoFile                Picture file for logotype (it is recommended PNG image with alpha channel)\n";
+		QTextStream(stdout)<<"   --logoShadowOffset        Offset shadow of logotype (default - 5)\n";
+		QTextStream(stdout)<<"   --logoShadowInt           Intensity shadow of logotype (default - 10, range 0-100)\n";
+		QTextStream(stdout)<<"   --logoShadowColor         R,G,B color shadow of logotype (default - \"100,100,100\")\n";
+		QTextStream(stdout)<<"   --foreground              Picture file for foreground (it is recommended PNG image with alpha channel)\n";
+		QTextStream(stdout)<<"   --aspect                  Aspect ratio (if 0.0 - source aspect (DAR), default - 0.0)\n";
+		QTextStream(stdout)<<"   --descr                   Custom text, located at the top of the header\n";
+		QTextStream(stdout)<<"   --outFolder               Folder for result files\n";
+		QTextStream(stdout)<<"   --frameBoxColor           R,G,B[,A] color frame border (default - \"120,120,120\")\n";
+		QTextStream(stdout)<<"   --frameBox                Depth border frame (default - 0)\n";
+		QTextStream(stdout)<<"   --stampDescr              Custom text, located on frame\n";
+		QTextStream(stdout)<<"   --stampDescrPos           Position custom text (default - \"lt\" (LeftTop), (rb, rt, lb, lr))\n";
+		QTextStream(stdout)<<"   --timeStep                The time between frames. If not equal to \"00:00:00\", the parameter \"frames\" are ignored. (default - \"00:00:00\")\n";
+		QTextStream(stdout)<<"   --maxRows                 Maximum rows if use --timeStep. (default - 50)\n";
+		QTextStream(stdout)<<"   --version                 Version string. (default - false)\n";
 		return 4;
 		}
 
@@ -328,6 +352,7 @@
 		int tStep = timeStepT.msecsTo(QTime::fromString(timeStep,"hh:mm:ss"));
 		vertCount = (length / tStep) / horCount;
 		vertCount++;
+		if (vertCount > maxRows) vertCount = maxRows;
 		frames = horCount * vertCount;
 		}
 
@@ -340,8 +365,10 @@
 // Высота кадра в листе
 	int heightFrame = hFrame / koeff;
 	if (aspect < -0.001 || aspect > 0.001) heightFrame = (double) widthFrame / aspect;
+		else heightFrame = (double) widthFrame / video->dar;
 // Высота листа		
 	int hList = heightFrame * vertCount + listBorder * 2;
+	if (version) hList = hList + 20;
 		
 	QFont headerFont (fontHeaderName, fontHeaderSize, fontHeaderWeight, fontHeaderItalic);
 	QFontMetrics fm (headerFont);
@@ -443,7 +470,10 @@
 				QPainter pStamp(&imStamp);
 				pStamp.setPen (getColorFromString (fontFrameColor));
 				pStamp.setFont (QFont (fontFrameName, fontFrameSize, fontFrameWeight, fontFrameItalic));
-				pStamp.drawText (imStamp.rect(), textFlag, QTime(0,0,0,0).addMSecs(pos).toString("hh:mm:ss"));
+				QString curTime;
+				if (stampStartFlag) curTime = QTime(QTime ().fromString (stampStart, "hh:mm:ss")).addMSecs(pos).toString("hh:mm:ss") + " (" + QTime().addMSecs(pos).toString("hh:mm:ss") +")";
+				else curTime = QTime().addMSecs(pos).toString("hh:mm:ss");
+				pStamp.drawText (imStamp.rect(), textFlag, curTime);
 				pStamp.end();
 				QPainter pFrame(&imFrame);
 				QImage imStampShadow = getShadow (imStamp, fontFrameShadowInt, getColorFromString (fontFrameShadowColor));
@@ -467,17 +497,6 @@
 				pFrame.end();
 				}
 
-// 			if (light){
-// 				QPainterPath lLine;
-// 				lLine.moveTo (0, imFrame.height());
-// 				lLine.lineTo (0, 0);
-// 				lLine.lineTo (imFrame.width(), 0);
-// 				QPainter pFrame(&imFrame);
-// 				pFrame.setPen ("white");
-// 				pFrame.drawPath(lLine);
-// 				pFrame.end();
-// 				}
-				
 			int cX=hi*widthFrame+headerX;
 			int cY=vi*heightFrame+listBorder+frameBorder*3+headerH;
 			pList.drawImage (cX+shadowOffset-shadowInt, (vi*heightFrame+headerH+listBorder+shadowOffset+frameBorder*3)-shadowInt, imFrameShadow);
@@ -488,14 +507,16 @@
 				pList.drawRect (cX, cY, widthFrame-frameBorder*2, heightFrame-frameBorder*2);
 				}
 			numFrame++;
+			app.processEvents();
 			}
 		}
 	if (! foreground.isEmpty()) pList.drawImage (QRectF (0,0,wList+listBorder*2, hList+headerH), QImage (foreground));
+	if (version) pList.drawText (10,imList.height()-6,"ScreenGen. Version "VERSION);
 	pList.end();
 	QString outputFile=QFileInfo(outFile.toUtf8()).fileName();
 	if (outFolder != "") outputFile=outFolder+"/"+QFileInfo(outFile.toUtf8()).fileName();
-	if (! imList.save(outputFile)) qDebug()<<"Error save file.";
-	qDebug()<<"Done.";
+	if (! imList.save(outputFile)) QTextStream(stdout)<<"Error save file.\n";
+	QTextStream(stdout)<<"Done.\n";
 	return 0;
 }

screengen-1.7-20130901.tar.bz2/src/qffmpeg.cpp -> screengen-1.8-20140909.tar.bz2/src/qffmpeg.cpp Changed

@@ -9,20 +9,26 @@
 
 	pAVFormatContext = avformat_alloc_context();
 	if (avformat_open_input (&pAVFormatContext, videoFile.toLocal8Bit(), NULL, NULL)!=0){
-		qDebug()<<"Error open file:"<<videoFile;
+		QTextStream(stdout)<<"Error open file:"<<videoFile<<"\n";
 		error=1;
 		return;
 		}
 	else if (avformat_find_stream_info (pAVFormatContext, NULL) < 0){
-		qDebug()<<"Not found streams in"<<videoFile;
+		QTextStream(stdout)<<"Not found streams in"<<videoFile<<"\n";
 		error=1;
 		return;
 		}
+
+// Продолжительность
 	duration = QTime(0,0,0,0).addMSecs (pAVFormatContext->duration / 1000).toString("hh:mm:ss");
+// Общий битрейт всех потоков
 	fullBitrate = QString::number (pAVFormatContext->bit_rate / 1000);
+// Количество потоков
 	streamsCount = pAVFormatContext->nb_streams;
+// Строка основных параметров
 	generalInfo = duration+", "+QObject::tr("Streams:")+" "+QString::number (streamsCount)+", "+QObject::tr("Full bitrate:")+" "+fullBitrate+" "+QObject::tr("kb/s");
 
+// Проверка наличия видеопотока и получение его номера
 	vStreamNumber=-1;
 	for (uint i=0; i < pAVFormatContext->nb_streams;i++)
 		if (pAVFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO){
@@ -30,37 +36,59 @@
 			break;
 			}
 	if (vStreamNumber == -1){
-		qDebug()<<"Not video stream in"<<videoFile;
+		QTextStream(stdout)<<"Not video stream in"<<videoFile<<"\n";
 		error=1;
 		return;
 		}
 
-	vCodecContext = pAVFormatContext->streams[vStreamNumber]->codec;
+// Проверка наличия в ffmpeg кодека для видеопотока
+	AVStream *vStream = pAVFormatContext->streams[vStreamNumber];
+	vCodecContext = vStream->codec;
 	vCodec = avcodec_find_decoder (vCodecContext->codec_id);
 	if (avcodec_open2 (vCodecContext, vCodec, NULL)){
-		qDebug()<<"Not open video codec in"<<videoFile;
+		QTextStream(stdout)<<"Not open video codec in"<<videoFile<<"\n";
 		error=1;
 		return;
 		}
 
-	vResolution = QString::number (vCodecContext->width) + "x" + QString::number (vCodecContext->height);
-	vFps = QString::number ((double) pAVFormatContext->streams[vStreamNumber]->r_frame_rate.num / pAVFormatContext->streams[vStreamNumber]->r_frame_rate.den);
+// Частота кадров
+	vFps = QString::number ((double) vStream->r_frame_rate.num / vStream->r_frame_rate.den);
+// Кодек
 	vCodecName = QString(vCodec->name).toUpper();
+// Размер исходного кадра
 	vWidth = vCodecContext->width;
 	vHeight = vCodecContext->height;
+// Размер исходного кадра в текстовом виде
+	vResolution = QString::number (vWidth) + "x" + QString::number (vHeight);
+// Продолжительность
 	iDuration = pAVFormatContext->duration;
 	
+// Вычисление Display Aspect Ratio (DAR). Соотношение сторон выводимого на экран кадра
+	dar = double (vWidth) / double (vHeight);
+	if (vStream->sample_aspect_ratio.num && av_cmp_q(vStream->sample_aspect_ratio, vStream->codec->sample_aspect_ratio)){
+		AVRational display_aspect_ratio;
+		av_reduce (&display_aspect_ratio.num, &display_aspect_ratio.den, vWidth * vStream->sample_aspect_ratio.num, vHeight * vStream->sample_aspect_ratio.den, 1024*1024);
+		dar = double (display_aspect_ratio.num) / double (display_aspect_ratio.den);
+		} else {
+			if (vCodecContext->sample_aspect_ratio.num) {
+			AVRational display_aspect_ratio;
+			av_reduce (&display_aspect_ratio.num, &display_aspect_ratio.den, vWidth * vCodecContext->sample_aspect_ratio.num, vHeight * vCodecContext->sample_aspect_ratio.den, 1024 * 1024);
+			dar = double (display_aspect_ratio.num) / double (display_aspect_ratio.den);
+			}
+		}
+		
+// Проверка наличия аудиопотока и получение его номера
 	aStreamNumber=-1;
 	for (uint i=0; i < pAVFormatContext->nb_streams;i++)
 		if (pAVFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO){
 			aStreamNumber=i;
 			break;
 			}
-	if (aStreamNumber == -1) qDebug()<<"Not audio stream in"<<videoFile;
+	if (aStreamNumber == -1) QTextStream(stdout)<<"Not audio stream in\n"<<videoFile<<endl;
 	else{
 		aCodecContext = pAVFormatContext->streams[aStreamNumber]->codec;
 		aCodec = avcodec_find_decoder (aCodecContext->codec_id);
-		if (avcodec_open2 (aCodecContext, aCodec, NULL)) qDebug()<<"Not open audio codec in"<<videoFile;
+		if (avcodec_open2 (aCodecContext, aCodec, NULL)) QTextStream(stdout)<<"Not open audio codec in"<<videoFile<<"\n"<<endl;
 		}
 
 	if (vCodecContext->codec_tag > 0){
@@ -71,16 +99,20 @@
 	char aChC[32];
 	if (aStreamNumber != -1){
 		av_get_channel_layout_string (aChC, sizeof(aChC), aCodecContext->channels, aCodecContext->channel_layout);
+// Количество каналов
 		aChannels = QString (aChC);
+// Частота дискретизации
 		aSamples = QString::number ((double)aCodecContext->sample_rate / 1000);
+// Битрейт
 		aBitrate = QString::number (get_bit_rate (aCodecContext)/1000);
+// Кодек
 		aCodecName = QString(aCodec->name).toUpper();
 		}
 	}
 
 // Вычисляет битрейт потока (пока только для звука, и то, не всегда)
 int TFfmpeg::get_bit_rate(AVCodecContext *ctx){
-	int bit_rate;
+	int bit_rate = 0;
 	int bits_per_sample;
 
 	switch(ctx->codec_type) {
@@ -89,14 +121,14 @@
 		case AVMEDIA_TYPE_SUBTITLE:
 		case AVMEDIA_TYPE_ATTACHMENT:
 			bit_rate = ctx->bit_rate;
-				break;
+			break;
 		case AVMEDIA_TYPE_AUDIO:
 			bits_per_sample = av_get_bits_per_sample(ctx->codec_id);
-			bit_rate = bits_per_sample ? ctx->sample_rate * ctx->channels * bits_per_sample : ctx->bit_rate;
-				break;
+			if (bits_per_sample) bit_rate = ctx->sample_rate * ctx->channels * bits_per_sample;
+				else bit_rate = ctx->bit_rate;
+			break;
 		default:
-			bit_rate = 0;
-				break;
+			break;
 		}
 	return bit_rate;
 }
@@ -154,13 +186,13 @@
 			avcodec_decode_video2 (vCodecContext, pFrame, &frameFinished, &packet);
 			if (frameFinished){
 				struct SwsContext *context;
-				context = sws_getContext (vCodecContext->width, vCodecContext->height, vCodecContext->pix_fmt, vCodecContext->width,vCodecContext->height, PIX_FMT_RGB24, SWS_BICUBIC, 0, 0, 0);
+				context = sws_getCachedContext (0, vCodecContext->width, vCodecContext->height, vCodecContext->pix_fmt, vCodecContext->width,vCodecContext->height, PIX_FMT_RGB24, SWS_BICUBIC, 0, 0, 0);
 				sws_scale (context, (uint8_t**) pFrame->data, pFrame->linesize, 0, vCodecContext->height, pFrameRGB->data, pFrameRGB->linesize);
 				for (int j=0; j<vCodecContext->height; j++) memcpy (img.scanLine (j), pFrameRGB->data[0] + j * pFrameRGB->linesize[0], vCodecContext->width * 3);
 				break;
 				}
 			}
-		av_free_packet (&packet);
+//		av_free_packet (&packet);
 		}
 	return img;
 }

screengen-1.7-20130901.tar.bz2/src/qffmpeg.h -> screengen-1.8-20140909.tar.bz2/src/qffmpeg.h Changed