Projects
home:vmp
ffDiaporama
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 38
View file
ffdiaporama_2.1-1.diff.gz
Added
@@ -0,0 +1,1481 @@ +--- ffdiaporama-2.1.orig/debian/changelog ++++ ffdiaporama-2.1/debian/changelog +@@ -0,0 +1,5 @@ ++ffdiaporama (2.1-1) UNRELEASED; urgency=medium ++ ++ * Initial release. (Closes: #XXXXXX) ++ ++ -- roland suchan <snrd@arcor.de> Fri, 08 Sep 2023 09:50:00 +0000 +--- ffdiaporama-2.1.orig/debian/compat ++++ ffdiaporama-2.1/debian/compat +@@ -0,0 +1 @@ ++9 +--- ffdiaporama-2.1.orig/debian/control ++++ ffdiaporama-2.1/debian/control +@@ -0,0 +1,12 @@ ++Source: ffdiaporama ++Maintainer: Roland Suchan <snrd@arcor.de> ++Section: misc ++Priority: optional ++Standards-Version: 3.9.2 ++Build-Depends: debhelper (>= 9), qmake6, qt6-base-dev, qt6-tools-dev, qt6-tools-dev-tools, qt6-svg-dev, libqt6sql6-sqlite, qt6-image-formats-plugins, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libexiv2-dev, libjpeg-dev, ffmpeg21-dev, libffmpeg21, libavdevice-dev, libsdl1.2-dev ++ ++Package: ffdiaporama ++Architecture: any ++Depends: ${shlibs:Depends}, ${misc:Depends}, libffmpeg21 ++Description: video creator ++ video creator. +--- ffdiaporama-2.1.orig/debian/copyright ++++ ffdiaporama-2.1/debian/copyright +@@ -0,0 +1,88 @@ ++GNU GENERAL PUBLIC LICENSE ++ ++Version 2, June 1991 ++ ++Copyright (C) 1989, 1991 Free Software Foundation, Inc. ++51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA ++ ++Everyone is permitted to copy and distribute verbatim copies ++of this license document, but changing it is not allowed. ++ ++Preamble ++ ++The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) 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 this service 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 make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. ++ ++For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. 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. ++ ++We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. ++ ++Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. ++ ++Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. ++ ++The precise terms and conditions for copying, distribution and modification follow. ++TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ++ ++0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". ++ ++Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. ++ ++1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. ++ ++You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. ++ ++2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: ++ ++ a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. ++ b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. ++ c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) ++ ++These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. ++ ++Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. ++ ++In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. ++ ++3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: ++ ++ a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, ++ b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, ++ c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) ++ ++The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. ++ ++If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. ++ ++4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. ++ ++5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. ++ ++6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. ++ ++7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), 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 distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. ++ ++If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. ++ ++It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. ++ ++This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. ++ ++8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. ++ ++9. The Free Software Foundation may publish revised and/or new versions of the 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 a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. ++ ++10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. ++ ++NO WARRANTY ++ ++11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. ++ ++12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE 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. ++ ++END OF TERMS AND CONDITIONS +--- ffdiaporama-2.1.orig/debian/rules ++++ ffdiaporama-2.1/debian/rules +@@ -0,0 +1,7 @@ ++#!/usr/bin/make -f ++%: ++ dh $@ ++override_dh_auto_configure: ++ qmake6 'QMAKE_CFLAGS_ISYSTEM=-I' 'INCLUDEPATH += /usr/include/ffmpeg2.1 /usr/include/taglib' 'LIBPATH += /usr/lib' ffDiaporama.pro /PREFIX=/usr ++override_dh_auto_build: ++ make -j4 +--- ffdiaporama-2.1.orig/debian/sources/format ++++ ffdiaporama-2.1/debian/sources/format +@@ -0,0 +1,2 @@ ++3.0 (quilt) ++ +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgAbout/DlgAbout.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/DlgAbout/DlgAbout.cpp +@@ -50,7 +50,7 @@ + File.setFileName(FName); + if (File.open(QIODevice::ReadOnly|QIODevice::Text)) { + QTextStream InStream(&File); +- InStream.setCodec("UTF-8"); ++ InStream.setEncoding(QStringConverter::Utf8); + Text=InStream.readAll(); + ui->ChangelogED->setText(Text); + File.close(); +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgAppSettings/DlgApplicationSettings.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/DlgAppSettings/DlgApplicationSettings.cpp +@@ -373,7 +373,7 @@ + double NumA=NameA.toDouble(); + QString NameB=StringListj+1; if (NameB.endsWith("k")) NameB=NameB.left(NameB.length()-1); + double NumB=NameB.toDouble(); +- if (NumA>NumB) StringList.swap(j,j+1); ++ if (NumA>NumB) StringList.swapItemsAt(j,j+1); + } + return StringList; + } +@@ -593,7 +593,7 @@ + for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) { + QString StrA=Listj.mid(Listj.lastIndexOf(":")+1); StrA=StrA.left(StrA.indexOf("#")); + QString StrB=Listj+1.mid(Listj+1.lastIndexOf(":")+1); StrB=StrB.left(StrB.indexOf("#")); +- if (StrA.toInt()>StrB.toInt()) List.swap(j,j+1); ++ if (StrA.toInt()>StrB.toInt()) List.swapItemsAt(j,j+1); + } + // Fill combo + for (int i=0;i<List.count();i++) { +@@ -638,7 +638,7 @@ + } + } + // Sort List +- for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swap(j,j+1); ++ for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swapItemsAt(j,j+1); + // Fill combo + for (int i=0;i<List.count();i++) { + Codec=Listi.left(Listi.indexOf("#####")); +@@ -674,7 +674,7 @@ + } + } + // Sort List +- for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swap(j,j+1); ++ for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swapItemsAt(j,j+1); + // Fill combo + for (int i=0;i<List.count();i++) { + Codec=Listi.left(Listi.indexOf("#####")); +@@ -720,7 +720,7 @@ + } + } + // Sort List +- for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swap(j,j+1); ++ for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swapItemsAt(j,j+1); + // Fill combo + for (int i=0;i<List.count();i++) { + Codec=Listi.left(Listi.indexOf("#####")); +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgAppSettings/DlgManageDevices/DlgManageDevices.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/DlgAppSettings/DlgManageDevices/DlgManageDevices.cpp +@@ -228,7 +228,7 @@ + for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) { + QString StrA=Listj.mid(Listj.lastIndexOf(":")+1); StrA=StrA.left(StrA.indexOf("#")); + QString StrB=Listj+1.mid(Listj+1.lastIndexOf(":")+1); StrB=StrB.left(StrB.indexOf("#")); +- if (StrA.toInt()>StrB.toInt()) List.swap(j,j+1); ++ if (StrA.toInt()>StrB.toInt()) List.swapItemsAt(j,j+1); + } + // Fill combo + for (int i=0;i<List.count();i++) { +@@ -272,7 +272,7 @@ + if ((Index<NBR_VIDEOCODECDEF)&&(VIDEOCODECDEFIndex.IsFind)) List.append(QString("%1#####%2").arg(VIDEOCODECDEFIndex.LongName).arg(Index)); + } + // Sort List +- for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swap(j,j+1); ++ for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swapItemsAt(j,j+1); + // Fill combo + for (int i=0;i<List.count();i++) { + Codec=Listi.left(Listi.indexOf("#####")); +@@ -301,7 +301,7 @@ + if ((Index<NBR_AUDIOCODECDEF)&&(AUDIOCODECDEFIndex.IsFind)) List.append(QString("%1#####%2").arg(AUDIOCODECDEFIndex.LongName).arg(Index)); + } + // Sort List +- for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swap(j,j+1); ++ for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swapItemsAt(j,j+1); + // Fill combo + for (int i=0;i<List.count();i++) { + Codec=Listi.left(Listi.indexOf("#####")); +@@ -394,7 +394,7 @@ + int NumA=NameA.toInt(); + QString NameB=Listj+1; if (NameB.endsWith("k")) NameB=NameB.left(NameB.length()-1); + int NumB=NameB.toInt(); +- if (NumA>NumB) List.swap(j,j+1); ++ if (NumA>NumB) List.swapItemsAt(j,j+1); + } + // Fill Combo box + ui->DBVideoBitRateCB->addItems(List); +@@ -441,7 +441,7 @@ + int NumA=NameA.toInt(); + QString NameB=Listj+1; if (NameB.endsWith("k")) NameB=NameB.left(NameB.length()-1); + int NumB=NameB.toInt(); +- if (NumA>NumB) List.swap(j,j+1); ++ if (NumA>NumB) List.swapItemsAt(j,j+1); + } + // Fill Combo box + ui->DBAudioBitRateCB->addItems(List); +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgExportProject/DlgExportProject.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/DlgExportProject/DlgExportProject.cpp +@@ -88,7 +88,7 @@ + ApplicationConfig->SettingsTable->SetTextValue(QString("%1_path").arg(BrowserTypeDefBROWSER_TYPE_EXPORT.BROWSERString),DestinationPath); + JobStarted=true; + ui->OkBt->setEnabled(false); +- ThreadCopy.setFuture(QtConcurrent::run(this,&DlgExportProject::DoProcessCopy)); ++ ThreadCopy.setFuture(QtConcurrent::run(&DlgExportProject::DoProcessCopy,this)); + Timer.start(500); + return false; + } +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgExportProject/DlgExportProject.h ++++ ffdiaporama-2.1/src/ffDiaporama/DlgExportProject/DlgExportProject.h +@@ -27,6 +27,7 @@ + // Include some common various class + #include "engine/cApplicationConfig.h" + #include "engine/_Diaporama.h" ++#include <QFileDialog> + + namespace Ui { + class DlgExportProject; +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgGMapsLocation/DlgGMapsLocation.h ++++ ffdiaporama-2.1/src/ffDiaporama/DlgGMapsLocation/DlgGMapsLocation.h +@@ -29,6 +29,7 @@ + #include <QNetworkReply> + #include <QKeyEvent> + #include <QLabel> ++#include <QMenu> + + namespace Ui { + class DlgGMapsLocation; +@@ -40,7 +41,7 @@ + Q_OBJECT + public: + int X,Y; +- explicit cCustomMapWidget(QWidget *Parent,Qt::WindowFlags f=0); ++ explicit cCustomMapWidget(QWidget *Parent,Qt::WindowFlags f=Qt::WindowFlags()); + + protected: + virtual void mouseReleaseEvent(QMouseEvent *ev); +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgImage/DlgImageCorrection.h ++++ ffdiaporama-2.1/src/ffDiaporama/DlgImage/DlgImageCorrection.h +@@ -24,6 +24,7 @@ + // Basic inclusions (common to all files) + #include "CustomCtrl/_QCustomDialog.h" + #include "engine/_Diaporama.h" ++#include <QHBoxLayout> + + #include "DlgImage/wgt_QEditImage/wgt_QEditImage.h" + #include "DlgImage/wgt_QEditVideo/wgt_QEditVideo.h" +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgImage/wgt_QGMapsMap/wgt_QGMapsMap.h ++++ ffdiaporama-2.1/src/ffDiaporama/DlgImage/wgt_QGMapsMap/wgt_QGMapsMap.h +@@ -26,6 +26,7 @@ + #include "engine/_Diaporama.h" + #include <QNetworkAccessManager> + #include <QNetworkReply> ++#include <QFileDialog> + + namespace Ui { + class wgt_QGMapsMap; +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgMusic/DlgMusicProperties.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/DlgMusic/DlgMusicProperties.cpp +@@ -283,7 +283,7 @@ + void DlgMusicProperties::s_UpMusic() { + int CurIndex=ui->PlayListTable->currentRow(); + if (CurIndex<1) return; +- DiaporamaObject->MusicList.swap(CurIndex,CurIndex-1); ++ DiaporamaObject->MusicList.swapItemsAt(CurIndex,CurIndex-1); + RefreshControl(true); + ui->PlayListTable->setCurrentCell(CurIndex-1,0); + } +@@ -293,7 +293,7 @@ + void DlgMusicProperties::s_DownMusic() { + int CurIndex=ui->PlayListTable->currentRow(); + if ((CurIndex<0)||(CurIndex>ui->PlayListTable->rowCount()-1)) return; +- DiaporamaObject->MusicList.swap(CurIndex,CurIndex+1); ++ DiaporamaObject->MusicList.swapItemsAt(CurIndex,CurIndex+1); + RefreshControl(true); + ui->PlayListTable->setCurrentCell(CurIndex+1,0); + } +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgRenderVideo/DlgRenderVideo.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/DlgRenderVideo/DlgRenderVideo.cpp +@@ -375,7 +375,7 @@ + for (int i=0;i<StringList.count();i++) for (int j=0;j<StringList.count()-1;j++) { + if (StringListj.endsWith("k")) NumA=StringListj.left(StringListj.length()-1).toDouble()*1000; else NumA=StringListj.toDouble(); + if (StringListj+1.endsWith("k")) NumB=StringListj+1.left(StringListj+1.length()-1).toDouble()*1000; else NumB=StringListj+1.toDouble(); +- if (NumA>NumB) StringList.swap(j,j+1); ++ if (NumA>NumB) StringList.swapItemsAt(j,j+1); + } + return StringList; + } +@@ -414,7 +414,7 @@ + for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) { + QString StrA=Listj.mid(Listj.lastIndexOf(":")+1); StrA=StrA.left(StrA.indexOf("#")); + QString StrB=Listj+1.mid(Listj+1.lastIndexOf(":")+1); StrB=StrB.left(StrB.indexOf("#")); +- if (StrA.toInt()>StrB.toInt()) List.swap(j,j+1); ++ if (StrA.toInt()>StrB.toInt()) List.swapItemsAt(j,j+1); + } + // Fill combo + for (int i=0;i<List.count();i++) { +@@ -494,7 +494,7 @@ + } + } + // Sort List +- for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swap(j,j+1); ++ for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swapItemsAt(j,j+1); + // Fill combo + for (int i=0;i<List.count();i++) { + Codec=Listi.left(Listi.indexOf("#####")); +@@ -537,7 +537,7 @@ + } + + // Sort List +- for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swap(j,j+1); ++ for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj>Listj+1) List.swapItemsAt(j,j+1); + // Fill combo + for (int i=0;i<List.count();i++) { + Codec=Listi.left(Listi.indexOf("#####")); +@@ -1026,7 +1026,7 @@ + false,AV_CODEC_ID_NONE,false,NULL,0,0,0,0,0,MakeAVRational(1,1),0, + true,AudioCodecIndex,2,AudioBitRate,AudioFrequency,Language); + InitDisplay(); +- ThreadEncode.setFuture(QtConcurrent::run(this,&DlgRenderVideo::DoThreadEncode)); ++ ThreadEncode.setFuture(QtConcurrent::run(&DlgRenderVideo::DoThreadEncode,this)); + + } else { + +@@ -1080,7 +1080,7 @@ + true,VideoCodecIndex,VBR && ((CurrentCodec==VCODEC_H264HQ)||(CurrentCodec==VCODEC_H264PQ)),&DefImageFormatStandardDiaporama->ImageGeometryImageSize,Final_W,Final_H,Ext_H,Internal_W,Internal_H,PixelAspectRatio,VideoBitRate, + ui->IncludeSoundCB->isChecked(),AudioCodecIndex,2,AudioBitRate,AudioFrequency,Language); + InitDisplay(); +- ThreadEncode.setFuture(QtConcurrent::run(this,&DlgRenderVideo::DoThreadEncode)); ++ ThreadEncode.setFuture(QtConcurrent::run(&DlgRenderVideo::DoThreadEncode,this)); + } + } + DisplayTimer.start(500); +@@ -1127,7 +1127,7 @@ + Text=Text+QString("</movie>\n"); + if (file.open(QIODevice::WriteOnly|QIODevice::Text)) { + QTextStream out(&file); +- out.setCodec("UTF-8"); ++ out.setEncoding(QStringConverter::Utf8); + out<<Text; + file.close(); + } +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgSlide/DlgSlideProperties.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/DlgSlide/DlgSlideProperties.cpp +@@ -897,7 +897,7 @@ + AppendPartialUndo(UNDOACTION_FULL_SLIDE,ShotTable,true); + + if (CurrentShotNbr>0) { +- CurrentSlide->List.swap(CurrentShotNbr,CurrentShotNbr-1); ++ CurrentSlide->List.swapItemsAt(CurrentShotNbr,CurrentShotNbr-1); + ShotTable->setUpdatesEnabled(false); + ShotTable->SetCurrentCell(CurrentShotNbr-1); + ShotTable->setUpdatesEnabled(true); // Reset timeline painting +@@ -911,7 +911,7 @@ + AppendPartialUndo(UNDOACTION_FULL_SLIDE,ShotTable,true); + + if (CurrentShotNbr<CurrentSlide->List.count()-1) { +- CurrentSlide->List.swap(CurrentShotNbr+1,CurrentShotNbr); ++ CurrentSlide->List.swapItemsAt(CurrentShotNbr+1,CurrentShotNbr); + ShotTable->setUpdatesEnabled(false); + ShotTable->SetCurrentCell(CurrentShotNbr+1); + ShotTable->setUpdatesEnabled(true); // Reset timeline painting +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgSlide/cShotComposer.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/DlgSlide/cShotComposer.cpp +@@ -671,7 +671,7 @@ + if (BlockSelectMode!=SELECTMODE_ONE) return; + if (CurrentCompoObjectNbr<1) return; + AppendPartialUndo(UNDOACTION_FULL_SLIDE,BlockTable,true); +- CompositionList->List.swap(CurrentCompoObjectNbr,CurrentCompoObjectNbr-1); ++ CompositionList->List.swapItemsAt(CurrentCompoObjectNbr,CurrentCompoObjectNbr-1); + // Reset thumbs if needed + ResetThumbs(false); + // Reset blocks table +@@ -685,7 +685,7 @@ + if (BlockSelectMode!=SELECTMODE_ONE) return; + if (CurrentCompoObjectNbr>=CompositionList->List.count()-1) return; + AppendPartialUndo(UNDOACTION_FULL_SLIDE,BlockTable,true); +- CompositionList->List.swap(CurrentCompoObjectNbr+1,CurrentCompoObjectNbr); ++ CompositionList->List.swapItemsAt(CurrentCompoObjectNbr+1,CurrentCompoObjectNbr); + // Reset thumbs if needed + ResetThumbs(false); + // Reset blocks table +@@ -785,7 +785,7 @@ + // 2nd step : sort blocks + for (int i=0;i<List.count();i++) + for (int j=0;j<List.count()-1;j++) +- if (Listj.Position>Listj+1.Position) List.swap(j,j+1); ++ if (Listj.Position>Listj+1.Position) List.swapItemsAt(j,j+1); + + // Last step : move blocks + for (int i=0;i<List.count();i++) { +@@ -813,7 +813,7 @@ + // 2nd step : sort blocks + for (int i=0;i<List.count();i++) + for (int j=0;j<List.count()-1;j++) +- if (Listj.Position>Listj+1.Position) List.swap(j,j+1); ++ if (Listj.Position>Listj+1.Position) List.swapItemsAt(j,j+1); + + // Last step : move blocks + for (int i=0;i<List.count();i++) { +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgSlide/cShotComposer.h ++++ ffdiaporama-2.1/src/ffDiaporama/DlgSlide/cShotComposer.h +@@ -27,6 +27,10 @@ + #include "DlgSlide/cInteractiveZone.h" + #include "DlgSlide/cCustomBlockTable.h" + #include "DlgSlide/cCustomShotTable.h" ++#include <QDoubleSpinBox> ++#include <QSpinBox> ++#include <QToolButton> ++#include <QCheckBox> + + class cShotComposer : public QCustomDialog { + Q_OBJECT +--- ffdiaporama-2.1.orig/src/ffDiaporama/DlgffDPjrProperties/DlgffDPjrProperties.h ++++ ffdiaporama-2.1/src/ffDiaporama/DlgffDPjrProperties/DlgffDPjrProperties.h +@@ -24,6 +24,7 @@ + // Basic inclusions (common to all files) + #include "CustomCtrl/_QCustomDialog.h" + #include "engine/_Diaporama.h" ++#include <QFileDialog> + + namespace Ui { + class DlgffDPjrProperties; +--- ffdiaporama-2.1.orig/src/ffDiaporama/HelpPopup/HelpContent.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/HelpPopup/HelpContent.cpp +@@ -80,7 +80,7 @@ + if (!Parent.isValid()) Parent=Model->index(0,0); // if Parent is root + Item=Model->contentItemAt(Parent); + if (Item) { +- NewSize=FM.width(Item->url().toString())+Indent; ++ NewSize=FM.horizontalAdvance(Item->url().toString())+Indent; + if (Size<NewSize) Size=NewSize; + } + +@@ -90,7 +90,7 @@ + Current=Model->index(row,0,Parent); + Item =Model->contentItemAt(Current); + if (Item) { +- NewSize=FM.width(Item->url().toString())+Indent; ++ NewSize=FM.horizontalAdvance(Item->url().toString())+Indent; + if (Size<NewSize) Size=NewSize; + } + if (Model->hasChildren(Current)) { +--- ffdiaporama-2.1.orig/src/ffDiaporama/MainWindow/cCustomSlideTable.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/MainWindow/cCustomSlideTable.cpp +@@ -123,7 +123,7 @@ + bool IsTransition=((Object->TransitionFamilly!=0)||(Object->TransitionSubType!=0)); + QPointF Table10; + +- Painter->setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::HighQualityAntialiasing|QPainter::NonCosmeticDefaultPen); ++ Painter->setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::Antialiasing|QPainter::NonCosmeticBrushPatterns); + Painter->setClipRect(QRectF(option.rect.x(),option.rect.y(),option.rect.width(),option.rect.height())); + // Fill background + Painter->fillRect(option.rect,QColor(WidgetBackground_Color)); +@@ -931,7 +931,7 @@ + + void cCustomSlideTable::wheelEvent(QWheelEvent *event) { + if (!PartitionMode) { +- int numDegrees = event->delta() / 8; ++ int numDegrees = event->angleDelta().y() / 8; + int numSteps = numDegrees / 15; + + SetCurrentCell(Diaporama->CurrentCol-numSteps); +--- ffdiaporama-2.1.orig/src/ffDiaporama/MainWindow/mainwindow.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/MainWindow/mainwindow.cpp +@@ -1597,7 +1597,7 @@ + bool EndffDPart=false; + int Num=0; + +- InStream.setCodec("UTF-8"); ++ InStream.setEncoding(QStringConverter::Utf8); + while (!InStream.atEnd()) { + QString Line=InStream.readLine(); + if (!EndffDPart) { +@@ -1850,8 +1850,8 @@ + DiaporamaObject->List0->StaticDuration=ApplicationConfig->NoShotDuration; + + if (Diaporama->ApplicationConfig->RandomTransition) { +- qsrand(QTime(0,0,0,0).msecsTo(QTime::currentTime())); +- int Random=qrand(); ++ QRandomGenerator(QTime(0,0,0,0).msecsTo(QTime::currentTime())); ++ int Random=QRandomGenerator::global()->generate(); + Random=int(double(IconList.List.count())*(double(Random)/double(RAND_MAX))); + if (Random<IconList.List.count()) { + Diaporama->ListCurIndex->TransitionFamilly=IconList.ListRandom.TransitionFamilly; +@@ -1879,8 +1879,8 @@ + DiaporamaObject->Parent =Diaporama; + + if (Diaporama->ApplicationConfig->RandomTransition) { +- qsrand(QTime(0,0,0,0).msecsTo(QTime::currentTime())); +- int Random=qrand(); ++ QRandomGenerator(QTime(0,0,0,0).msecsTo(QTime::currentTime())); ++ int Random=QRandomGenerator::global()->generate(); + Random=int(double(IconList.List.count())*(double(Random)/double(RAND_MAX))); + if (Random<IconList.List.count()) { + Diaporama->ListCurIndex->TransitionFamilly=IconList.ListRandom.TransitionFamilly; +@@ -1986,8 +1986,8 @@ + + // Now setup transition + if (Diaporama->ApplicationConfig->RandomTransition) { +- qsrand(QTime(0,0,0,0).msecsTo(QTime::currentTime())); +- int Random=qrand(); ++ QRandomGenerator(QTime(0,0,0,0).msecsTo(QTime::currentTime())); ++ int Random=QRandomGenerator::global()->generate(); + Random=int(double(IconList.List.count())*(double(Random)/double(RAND_MAX))); + if (Random<IconList.List.count()) { + Diaporama->ListCurIndex->TransitionFamilly=IconList.ListRandom.TransitionFamilly; +@@ -2109,9 +2109,9 @@ + SavedCurIndex=CurIndex-1; + + // Sort files in the fileList +- if (ui->Browser->GetSortOrder()==SORTORDER_BYNUMBER) qSort(FileList.begin(),FileList.end(),ByNumber); +- else if (ui->Browser->GetSortOrder()==SORTORDER_BYNAME) qSort(FileList.begin(),FileList.end(),ByName); +- else if (ui->Browser->GetSortOrder()==SORTORDER_BYDATE) qSort(FileList.begin(),FileList.end(),ByDate); ++ //if (ui->Browser->GetSortOrder()==SORTORDER_BYNUMBER) qSort(FileList.begin(),FileList.end(),ByNumber); //ooo ++ //else if (ui->Browser->GetSortOrder()==SORTORDER_BYNAME) qSort(FileList.begin(),FileList.end(),ByName); //ooo ++ //else if (ui->Browser->GetSortOrder()==SORTORDER_BYDATE) qSort(FileList.begin(),FileList.end(),ByDate); //ooo + + // Parse all files to find music files (and put them in MusicFileList) + QStringList MusicFileList; +@@ -2262,7 +2262,7 @@ + QString OtherPart="<!DOCTYPE ffDiaporama>\n"; + bool EndffDPart=false; + +- InStream.setCodec("UTF-8"); ++ InStream.setEncoding(QStringConverter::Utf8); + while (!InStream.atEnd()) { + QString Line=InStream.readLine(); + if (!EndffDPart) { +@@ -2460,8 +2460,8 @@ + //************************************************************* + if (ChapterNum<1) { + if (Diaporama->ApplicationConfig->RandomTransition) { +- qsrand(QTime(0,0,0,0).msecsTo(QTime::currentTime())); +- int Random=qrand(); ++ QRandomGenerator(QTime(0,0,0,0).msecsTo(QTime::currentTime())); ++ int Random=QRandomGenerator::global()->generate(); + Random=int(double(IconList.List.count())*(double(Random)/double(RAND_MAX))); + if (Random<IconList.List.count()) { + Diaporama->ListCurIndex->TransitionFamilly=IconList.ListRandom.TransitionFamilly; +@@ -2553,7 +2553,7 @@ + for (int j=0;j<Size.count()-1;j++) { + int a=Sizej.left(Sizej.indexOf("x")).toInt(); + int b=Sizej+1.left(Sizej+1.indexOf("x")).toInt(); +- if (a>b) Size.swap(j,j+1); ++ if (a>b) Size.swapItemsAt(j,j+1); + } + } + +@@ -2894,8 +2894,8 @@ + + // Setup transition + if (Diaporama->ApplicationConfig->RandomTransition) { +- qsrand(QTime(0,0,0,0).msecsTo(QTime::currentTime())); +- int Random=qrand(); ++ QRandomGenerator(QTime(0,0,0,0).msecsTo(QTime::currentTime())); ++ int Random=QRandomGenerator::global()->generate(); + Random=int(double(IconList.List.count())*(double(Random)/double(RAND_MAX))); + if (Random<IconList.List.count()) { + Diaporama->ListCurIndex->TransitionFamilly=IconList.ListRandom.TransitionFamilly; +@@ -3217,9 +3217,9 @@ + if ((Current<0)||(Current>=Diaporama->List.count())) return; + ui->timeline->CurrentSelectionList(&SlideList); + +- qsrand(QTime(0,0,0,0).msecsTo(QTime::currentTime())); ++ QRandomGenerator(QTime(0,0,0,0).msecsTo(QTime::currentTime())); + for (int i=0;i<SlideList.count();i++) { +- int Random=qrand(); ++ int Random=QRandomGenerator::global()->generate(); + Random=int(double(IconList.List.count())*(double(Random)/double(RAND_MAX))); + if (Random<IconList.List.count()) { + Diaporama->ListSlideListi->TransitionFamilly=IconList.ListRandom.TransitionFamilly; +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/_Diaporama.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/engine/_Diaporama.cpp +@@ -986,8 +986,8 @@ + } + } else { + QPainter::RenderHints hints=(!PreviewMode || (ApplicationConfig==NULL) || ApplicationConfig->Smoothing)? +- QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::HighQualityAntialiasing|QPainter::NonCosmeticDefaultPen: +- QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::HighQualityAntialiasing|QPainter::NonCosmeticDefaultPen; ++ QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::Antialiasing|QPainter::NonCosmeticBrushPatterns: ++ QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::Antialiasing|QPainter::NonCosmeticBrushPatterns; + + if (IsFullScreen) { + +@@ -1674,7 +1674,7 @@ + } else { + // Save file now + QTextStream out(&file); +- out.setCodec("UTF-8"); ++ out.setEncoding(QStringConverter::Utf8); + domDocument.save(out,4); + // Iterate for ressources + for (int i=0;i<ResKeyList.count();i++) { +@@ -2423,7 +2423,7 @@ + + // Save ffDPart in file now + QTextStream out(&file); +- out.setCodec("UTF-8"); ++ out.setEncoding(QStringConverter::Utf8); + domDocument.save(out,4); + + // Iterate for ressources +@@ -2574,7 +2574,7 @@ + // Prepare a transparent image + QPainter P; + P.begin(&Image); +- P.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::HighQualityAntialiasing|QPainter::NonCosmeticDefaultPen); ++ P.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::Antialiasing|QPainter::NonCosmeticBrushPatterns); + P.setCompositionMode(QPainter::CompositionMode_Source); + P.fillRect(0,0,W,H,Qt::transparent); + P.setCompositionMode(QPainter::CompositionMode_SourceOver); +@@ -2608,7 +2608,7 @@ + QPainter P; + + P.begin(&Image); +- P.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::HighQualityAntialiasing|QPainter::NonCosmeticDefaultPen); ++ P.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::Antialiasing|QPainter::NonCosmeticBrushPatterns); + + // Draw background + if ((Info->IsTransition)&&((Info->CurrentObject_Number==0)||(Info->CurrentObject_BackgroundIndex!=Info->TransitObject_BackgroundIndex))) { +@@ -2655,10 +2655,10 @@ + //==============> Music track part + + if ((Info->CurrentObject)&&(Info->CurrentObject_MusicTrack)) +- ThreadPrepareCurrentMusicBloc.setFuture(QtConcurrent::run(this,&cDiaporama::PrepareMusicBloc,PreviewMode,Info->CurrentObject_Number,Info->CurrentObject_InObjectTime,Info->CurrentObject_MusicTrack)); ++ ThreadPrepareCurrentMusicBloc.setFuture(QtConcurrent::run(&cDiaporama::PrepareMusicBloc,this,PreviewMode,Info->CurrentObject_Number,Info->CurrentObject_InObjectTime,Info->CurrentObject_MusicTrack)); + + if ((Info->TransitObject)&&(Info->TransitObject_MusicTrack)) +- ThreadPrepareTransitMusicBloc.setFuture(QtConcurrent::run(this,&cDiaporama::PrepareMusicBloc,PreviewMode,Info->TransitObject_Number,Info->TransitObject_InObjectTime,Info->TransitObject_MusicTrack)); ++ ThreadPrepareTransitMusicBloc.setFuture(QtConcurrent::run(&cDiaporama::PrepareMusicBloc,this,PreviewMode,Info->TransitObject_Number,Info->TransitObject_InObjectTime,Info->TransitObject_MusicTrack)); + + //==============> Image part + +@@ -2670,7 +2670,7 @@ + Info->TransitObject_PreparedImage=QImage(W,H,QImage::Format_ARGB32_Premultiplied); + QPainter P; + P.begin(&Info->TransitObject_PreparedImage); +- P.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::HighQualityAntialiasing|QPainter::NonCosmeticDefaultPen); ++ P.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::Antialiasing|QPainter::NonCosmeticBrushPatterns); + P.fillRect(0,0,W,H,Qt::black);//Qt::transparent); + P.end(); + } +@@ -2710,7 +2710,7 @@ + + //==============> Mixing of music and soundtrack + QTime b; +- b.start(); ++ b.currentTime(); + + if ((Info->CurrentObject)&&(Info->CurrentObject_MusicTrack)&&(ThreadPrepareCurrentMusicBloc.isRunning())) ThreadPrepareCurrentMusicBloc.waitForFinished(); + if ((Info->TransitObject)&&(Info->TransitObject_MusicTrack)&&(ThreadPrepareTransitMusicBloc.isRunning())) ThreadPrepareTransitMusicBloc.waitForFinished(); +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/_EncodeVideo.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/engine/_EncodeVideo.cpp +@@ -927,7 +927,14 @@ + + // If not static image then compute using threaded function + if ((!PreviousFrame)||(PreviousFrame->RenderedImage.isNull())) +- ThreadAssembly.setFuture(QtConcurrent::run(this,&cEncodeVideo::Assembly,Frame,PreviousFrame,&RenderMusic,&ToEncodeMusic,Continue)); ++ //printf("Test\n"); ++ //ThreadAssembly.setFuture(QtConcurrent::run(&cEncodeVideo::Assembly,this,Frame,PreviousFrame,&RenderMusic,&ToEncodeMusic,Continue)); ++ //ThreadAssembly.setFuture(QtConcurrent::run(&cEncodeVideo::Assembly,this)); ++ //ThreadAssembly.setFuture(QtConcurrent::run(= {Assembly(Frame,PreviousFrame,&RenderMusic,&ToEncodeMusic,Continue);})); ++ Assembly(Frame,PreviousFrame,&RenderMusic,&ToEncodeMusic,Continue); ++// ThreadAssembly.setFuture(QtConcurrent::run(= {Assembly(Frame,PreviousFrame,dynamic_cast< cSoundBlockList* >(RenderMusic),dynamic_cast< cSoundBlockList* >(ToEncodeMusic),Continue);})); ++ //ThreadAssembly.setFuture(QtConcurrent::run(static_cast<void(*)(int)>(Assembly,Frame,PreviousFrame,&RenderMusic,&ToEncodeMusic,&Continue))); ++ //ThreadAssembly.setFuture(QtConcurrent::run(qOverload<int>(Assembly),Frame,PreviousFrame,&RenderMusic,&ToEncodeMusic,&Continue)); + else Assembly(Frame,PreviousFrame,&RenderMusic,&ToEncodeMusic,Continue); + //Assembly+=Time.elapsed(); Time.restart(); + +@@ -966,7 +973,7 @@ + + //************************************************************************************************************************************************* + +-void cEncodeVideo::Assembly(cDiaporamaObjectInfo *Frame,cDiaporamaObjectInfo *PreviousFrame,cSoundBlockList *RenderMusic,cSoundBlockList *ToEncodeMusic,bool &Continue) { ++void cEncodeVideo::Assembly(cDiaporamaObjectInfo *Frame,cDiaporamaObjectInfo *PreviousFrame,cSoundBlockList *RenderMusic,cSoundBlockList *ToEncodeMusic,bool Continue) { + // Make final assembly + Diaporama->DoAssembly(ComputePCT(Frame->CurrentObject?Frame->CurrentObject->GetSpeedWave():0,Frame->TransitionPCTDone),Frame,InternalWidth,InternalHeight,QTPIXFMT); + +@@ -976,17 +983,19 @@ + + // Write data to disk + if ((Continue)&&(AudioStream)&&(AudioFrame)) +- ThreadEncodeAudio.setFuture(QtConcurrent::run(this,&cEncodeVideo::EncodeMusic,Frame,RenderMusic,ToEncodeMusic,Continue)); ++ //ThreadEncodeAudio.setFuture(QtConcurrent::run(&cEncodeVideo::EncodeMusic,this,Frame,RenderMusic,ToEncodeMusic,Continue)); ++ ThreadAssembly.setFuture(QtConcurrent::run(={EncodeMusic(Frame,RenderMusic,ToEncodeMusic,Continue);})); + + if ((Continue)&&(VideoStream)&&(VideoFrameConverter)&&(VideoFrame)) { + QImage *Image=((PreviousFrame)&&(!PreviousFrame->IsTransition)&&(Frame->IsShotStatic)&&(!Frame->IsTransition))?NULL:&Frame->RenderedImage; +- ThreadEncodeVideo.setFuture(QtConcurrent::run(this,&cEncodeVideo::EncodeVideo,Image,Continue)); ++// ThreadEncodeVideo.setFuture(QtConcurrent::run(&cEncodeVideo::EncodeVideo,this,Image,Continue)); ++ ThreadAssembly.setFuture(QtConcurrent::run(={EncodeVideo(Image,Continue);})); + } + } + + //************************************************************************************************************************************************* + +-void cEncodeVideo::EncodeMusic(cDiaporamaObjectInfo *Frame,cSoundBlockList *RenderMusic,cSoundBlockList *ToEncodeMusic,bool &Continue) { ++void cEncodeVideo::EncodeMusic(cDiaporamaObjectInfo *Frame,cSoundBlockList *RenderMusic,cSoundBlockList *ToEncodeMusic,bool Continue) { + // mix audio data + int MaxJ=Frame->CurrentObject_MusicTrack->NbrPacketForFPS; + if (MaxJ>Frame->CurrentObject_MusicTrack->ListCount()) MaxJ=Frame->CurrentObject_MusicTrack->ListCount(); +@@ -1175,7 +1184,7 @@ + + //************************************************************************************************************************************************* + +-void cEncodeVideo::EncodeVideo(QImage *SrcImage,bool &Continue) { ++void cEncodeVideo::EncodeVideo(QImage *SrcImage,bool Continue) { + QImage *Image=SrcImage; + int errcode; + +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/_EncodeVideo.h ++++ ffdiaporama-2.1/src/ffDiaporama/engine/_EncodeVideo.h +@@ -123,9 +123,9 @@ + bool PrepareTAG(QString Language); + QString AdjustMETA(QString Text); + +- void Assembly(cDiaporamaObjectInfo *Frame,cDiaporamaObjectInfo *PreviousFrame,cSoundBlockList *RenderMusic,cSoundBlockList *ToEncodeMusic,bool &Continue); +- void EncodeMusic(cDiaporamaObjectInfo *Frame,cSoundBlockList *RenderMusic,cSoundBlockList *ToEncodeMusic,bool &Continue); +- void EncodeVideo(QImage *ImageList,bool &Continue); ++ void Assembly(cDiaporamaObjectInfo *Frame,cDiaporamaObjectInfo *PreviousFrame,cSoundBlockList *RenderMusic,cSoundBlockList *ToEncodeMusic,bool Continue); ++ void EncodeMusic(cDiaporamaObjectInfo *Frame,cSoundBlockList *RenderMusic,cSoundBlockList *ToEncodeMusic,bool Continue); ++ void EncodeVideo(QImage *ImageList,bool Continue); + }; + + #endif // _ENCODEVIDEO_H +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/_GlobalDefines.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/engine/_GlobalDefines.cpp +@@ -148,7 +148,7 @@ + //==================================================================================================================== + + QString FormatLongDate(QDate EventDate) { +- return UpInitials(EventDate.toString(Qt::DefaultLocaleLongDate)); ++ return UpInitials(QLocale().toString(EventDate, QLocale::LongFormat)); + } + + //==================================================================================================================== +@@ -244,7 +244,7 @@ + // UTILITY FUNCTIONS + //==================================================================================================================== + +-QAction *CreateMenuAction(QImage *Icon,QString Text,int Data,bool Checkable,bool IsCheck,QWidget *Parent) { ++QAction *CreateMenuAction(QImage *Icon,QString Text,int Data,bool Checkable,bool IsCheck,QObject *Parent) { + QAction *Action; + if (Icon) Action=new QAction(QIcon(QPixmap().fromImage(*Icon)),Text,Parent); + else Action=new QAction(Text,Parent); +@@ -258,7 +258,7 @@ + + //==================================================================================================================== + +-QAction *CreateMenuAction(QIcon Icon,QString Text,int Data,bool Checkable,bool IsCheck,QWidget *Parent) { ++QAction *CreateMenuAction(QIcon Icon,QString Text,int Data,bool Checkable,bool IsCheck,QObject *Parent) { + QAction *Action; + Action=new QAction(Icon,Text,Parent); + Action->setIconVisibleInMenu(true); +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/_GlobalDefines.h ++++ ffdiaporama-2.1/src/ffDiaporama/engine/_GlobalDefines.h +@@ -23,6 +23,7 @@ + + #include "BasicDefines.h" + #include <QAction> ++#include <QFont> + + #if QT_VERSION < 0x050000 + #ifdef Q_OS_WIN +@@ -108,8 +109,8 @@ + QString GetCumulInfoStr(QStringList *InformationList,QString Key1,QString Key2); // Return a string concataining each value of a key containing key1 and key2 + int getCpuCount(); // Retrieve number of processor + QString GetTextSize(int64_t Size); // transform a size (_int64) in a string with apropriate unit (Gb/Tb...) +-QAction *CreateMenuAction(QImage *Icon,QString Text,int Data,bool Checkable,bool IsCheck,QWidget *Parent); +-QAction *CreateMenuAction(QIcon Icon,QString Text,int Data,bool Checkable,bool IsCheck,QWidget *Parent); ++QAction *CreateMenuAction(QImage *Icon,QString Text,int Data,bool Checkable,bool IsCheck,QObject *Parent); ++QAction *CreateMenuAction(QIcon Icon,QString Text,int Data,bool Checkable,bool IsCheck,QObject *Parent); + + //==================================================================== + // VARIOUS +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/_Model.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/engine/_Model.cpp +@@ -135,7 +135,7 @@ + + QPainter P; + P.begin(&Thumb); +- P.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::HighQualityAntialiasing|QPainter::NonCosmeticDefaultPen); ++ P.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::Antialiasing|QPainter::NonCosmeticBrushPatterns); + P.setCompositionMode(QPainter::CompositionMode_SourceOver); + QList<cCompositionObjectContext *>PreparedBrushList; + +@@ -211,7 +211,7 @@ + QString OtherPart="<!DOCTYPE ffDiaporama>\n"; + bool EndffDPart=false; + +- InStream.setCodec("UTF-8"); ++ InStream.setEncoding(QStringConverter::Utf8); + while (!InStream.atEnd()) { + QString Line=InStream.readLine(); + if (!EndffDPart) { +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/_StyleDefinitions.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/engine/_StyleDefinitions.cpp +@@ -157,7 +157,7 @@ + //************************************************ + + void cStyleCollection::SortList() { +- qSort(Collection.begin(),Collection.end(),toAssending); ++ std::sort(Collection.begin(),Collection.end(),toAssending); + } + + //************************************************ +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/_StyleDefinitions.h ++++ ffdiaporama-2.1/src/ffDiaporama/engine/_StyleDefinitions.h +@@ -27,6 +27,7 @@ + + // Include some additional standard class + #include <QComboBox> ++#include <QList> + + //============================================ + // Define styles name used in xml file +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/_Transition.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/engine/_Transition.cpp +@@ -418,7 +418,7 @@ + QFileInfoList Files=Folder.entryInfoList();; + for (int i=0;i<Files.count();i++) if (Filesi.isFile() && QString(Filesi.suffix()).toLower()=="png") List.append(cLumaObject(TransitionFamilly,List.count(),Filesi.absoluteFilePath())); + // Sort list by name +- for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj.Name>Listj+1.Name) List.swap(j,j+1); ++ for (int i=0;i<List.count();i++) for (int j=0;j<List.count()-1;j++) if (Listj.Name>Listj+1.Name) List.swapItemsAt(j,j+1); + } + // Register icons for this list + for (int i=0;i<List.count();i++) IconList.List.append(cIconObject(TransitionFamilly,i,&Listi)); +@@ -479,7 +479,7 @@ + QImage Img(hyp,hyp,QImage::Format_ARGB32_Premultiplied); + QPainter Painter; + Painter.begin(&Img); +- Painter.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::HighQualityAntialiasing|QPainter::NonCosmeticDefaultPen); ++ Painter.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing|QPainter::SmoothPixmapTransform|QPainter::Antialiasing|QPainter::NonCosmeticBrushPatterns); + Painter.setCompositionMode(QPainter::CompositionMode_Source); + Painter.fillRect(QRect(0,0,hyp,hyp),Qt::transparent); + Painter.setCompositionMode(QPainter::CompositionMode_SourceOver); +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/_Variables.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/engine/_Variables.cpp +@@ -188,8 +188,8 @@ + else if (Variablesi.VarName=="PYR") VarName=QString("%1").arg(Object->Parent->ProjectInfo->EventDate.year()); + else if (Variablesi.VarName=="PMD") VarName=ito2a(Object->Parent->ProjectInfo->EventDate.month()); + else if (Variablesi.VarName=="PDY") VarName=ito2a(Object->Parent->ProjectInfo->EventDate.day()); +- else if (Variablesi.VarName=="PMM") VarName=UpInitials(Object->Parent->ProjectInfo->EventDate.longMonthName(Object->Parent->ProjectInfo->EventDate.month())); +- else if (Variablesi.VarName=="PDW") VarName=UpInitials(Object->Parent->ProjectInfo->EventDate.longDayName(Object->Parent->ProjectInfo->EventDate.dayOfWeek())); ++ else if (Variablesi.VarName=="PMM") VarName=UpInitials(QLocale().monthName(Object->Parent->ProjectInfo->EventDate.month())); ++ else if (Variablesi.VarName=="PDW") VarName=UpInitials(QLocale().dayName(Object->Parent->ProjectInfo->EventDate.dayOfWeek())); + + // Current slide + else if (Variablesi.VarName=="CSN") VarName=Object->GetDisplayName(); +@@ -210,8 +210,8 @@ + else if (Variablesi.VarName=="CYR") VarName=QString("%1").arg((CurrentChapter->OverrideProjectEventDate?CurrentChapter->ChapterEventDate:Object->Parent->ProjectInfo->EventDate).year()); + else if (Variablesi.VarName=="CMD") VarName=ito2a((CurrentChapter->OverrideProjectEventDate?CurrentChapter->ChapterEventDate:Object->Parent->ProjectInfo->EventDate).month()); + else if (Variablesi.VarName=="CDY") VarName=ito2a((CurrentChapter->OverrideProjectEventDate?CurrentChapter->ChapterEventDate:Object->Parent->ProjectInfo->EventDate).day()); +- else if (Variablesi.VarName=="CMM") VarName=UpInitials(QDate().longMonthName((CurrentChapter->OverrideProjectEventDate?CurrentChapter->ChapterEventDate:Object->Parent->ProjectInfo->EventDate).month())); +- else if (Variablesi.VarName=="CDW") VarName=UpInitials(QDate().longDayName((CurrentChapter->OverrideProjectEventDate?CurrentChapter->ChapterEventDate:Object->Parent->ProjectInfo->EventDate).dayOfWeek())); ++ else if (Variablesi.VarName=="CMM") VarName=UpInitials(QLocale().monthName((CurrentChapter->OverrideProjectEventDate?CurrentChapter->ChapterEventDate:Object->Parent->ProjectInfo->EventDate).month())); ++ else if (Variablesi.VarName=="CDW") VarName=UpInitials(QLocale().dayName((CurrentChapter->OverrideProjectEventDate?CurrentChapter->ChapterEventDate:Object->Parent->ProjectInfo->EventDate).dayOfWeek())); + + // Various values + else if (Variablesi.VarName=="FFD") VarName=QString("%1 (%2)").arg(Object->Parent->ProjectInfo->Composer).arg(Object->Parent->ProjectInfo->ffDRevision); +@@ -225,13 +225,13 @@ + else if (Variablesi.VarName=="END") VarName=QApplication::translate("Variables","The end"); + + // Today date values +- else if (Variablesi.VarName=="TLD") VarName=UpInitials(QDate::currentDate().toString(Qt::DefaultLocaleLongDate)); ++ else if (Variablesi.VarName=="TLD") VarName=UpInitials(QLocale().toString(QDate::currentDate(),QLocale::LongFormat)); + else if (Variablesi.VarName=="TSD") VarName=QDate::currentDate().toString(Object->Parent->ApplicationConfig->ShortDateFormat); + else if (Variablesi.VarName=="TYR") VarName=QString("%1").arg(QDate::currentDate().year()); + else if (Variablesi.VarName=="TMD") VarName=ito2a(QDate::currentDate().month()); + else if (Variablesi.VarName=="TDY") VarName=ito2a(QDate::currentDate().day()); +- else if (Variablesi.VarName=="TMM") VarName=UpInitials(QDate::currentDate().longMonthName(QDate::currentDate().month())); +- else if (Variablesi.VarName=="TDW") VarName=UpInitials(QDate::currentDate().longDayName(QDate::currentDate().dayOfWeek())); ++ else if (Variablesi.VarName=="TMM") VarName=UpInitials(QLocale().monthName(QDate::currentDate().month())); ++ else if (Variablesi.VarName=="TDW") VarName=UpInitials(QLocale().dayName(QDate::currentDate().dayOfWeek())); + + else VarName=""; + +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/_Variables.h ++++ ffdiaporama-2.1/src/ffDiaporama/engine/_Variables.h +@@ -26,6 +26,7 @@ + + // Specific inclusions + #include "_Diaporama.h" ++#include <QMenu> + + class cVariableItem { + public: +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/cApplicationConfig.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/engine/cApplicationConfig.cpp +@@ -411,7 +411,7 @@ + + if (file.open(QFile::ReadOnly | QFile::Text)) { + QTextStream in(&file); +- in.setCodec("UTF-8"); ++ in.setEncoding(QStringConverter::Utf8); + if (domDocument.setContent(in.readAll(),true,&errorStr,&errorLine,&errorColumn)) { + domDocument.setContent(domDocument.toString(4),true,&errorStr,&errorLine,&errorColumn); + if ((root.elementsByTagName("GlobalPreferences").length()>0)&&(root.elementsByTagName("GlobalPreferences").item(0).isElement()==true)) { +@@ -447,7 +447,7 @@ + QFile File(UserConfigPath+QString("LOCALEVERSION.TXT")); + if (File.open(QFile::ReadOnly | QFile::Text)) { + QTextStream InStream(&File); +- InStream.setCodec("UTF-8"); ++ InStream.setEncoding(QStringConverter::Utf8); + WebTRVersion=InStream.readLine(); + File.close(); + } +@@ -457,7 +457,7 @@ + QFile File(UserConfigPath+QString("WIKIVERSION.TXT")); + if (File.open(QFile::ReadOnly | QFile::Text)) { + QTextStream InStream(&File); +- InStream.setCodec("UTF-8"); ++ InStream.setEncoding(QStringConverter::Utf8); + WebWIKIVersion=InStream.readLine(); + File.close(); + } +@@ -474,7 +474,7 @@ + QFile File(UserConfigPath+QString("%1_VERSION.TXT").arg(CurrentSubLanguage)); + if (File.open(QFile::ReadOnly | QFile::Text)) { + QTextStream InStream(&File); +- InStream.setCodec("UTF-8"); ++ InStream.setEncoding(QStringConverter::Utf8); + ActualTRVersion=InStream.readLine(); + File.close(); + } +@@ -482,7 +482,7 @@ + QFile File(UserConfigPath+QString("%1_VERSION.TXT").arg(CurrentLanguage)); + if (File.open(QFile::ReadOnly | QFile::Text)) { + QTextStream InStream(&File); +- InStream.setCodec("UTF-8"); ++ InStream.setEncoding(QStringConverter::Utf8); + ActualTRVersion=InStream.readLine(); + File.close(); + } +@@ -511,7 +511,7 @@ + QFile File(UserConfigPath+QString("%1_WIKIVERSION.TXT").arg(CurrentSubLanguage)); + if (File.open(QFile::ReadOnly | QFile::Text)) { + QTextStream InStream(&File); +- InStream.setCodec("UTF-8"); ++ InStream.setEncoding(QStringConverter::Utf8); + ActualWIKIVersion=InStream.readLine(); + File.close(); + } +@@ -519,7 +519,7 @@ + QFile File(UserConfigPath+QString("%1_WIKIVERSION.TXT").arg(CurrentLanguage)); + if (File.open(QFile::ReadOnly | QFile::Text)) { + QTextStream InStream(&File); +- InStream.setCodec("UTF-8"); ++ InStream.setEncoding(QStringConverter::Utf8); + ActualWIKIVersion=InStream.readLine(); + File.close(); + } +@@ -619,7 +619,7 @@ + + if (IsOk) { + QTextStream in(&file); +- in.setCodec("UTF-8"); ++ in.setEncoding(QStringConverter::Utf8); + if (!domDocument.setContent(in.readAll(),true,&errorStr,&errorLine,&errorColumn)) { + ToLog(LOGMSG_CRITICAL,QApplication::translate("MainWindow","Error reading content of configuration file","Error message")+" "+QDir::toNativeSeparators(TypeConfigFile==USERCONFIGFILE?UserConfigFile:GlobalConfigFile)); + IsOk=false; +@@ -981,7 +981,7 @@ + return false; + } + QTextStream out(&file); +- out.setCodec(QTextCodec::codecForName("UTF-8")); ++ out.setEncoding(QStringConverter::Utf8); + domDocument.save(out,4); + file.close(); + +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/cBaseMediaFile.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/engine/cBaseMediaFile.cpp +@@ -470,7 +470,7 @@ + + FileSize =QFileInfo(FileName).size(); + ModifDateTime=QFileInfo(FileName).lastModified(); +- CreatDateTime=QFileInfo(FileName).created(); ++ CreatDateTime=QFileInfo(FileName).birthTime(); + + IsValide=true; + return true; +@@ -624,7 +624,7 @@ + QString Line=""; + while (AllInfo!="") { + int j=0; +- while ((j<AllInfo.length())&&((AllInfoj>=char(32))||(AllInfoj==9))) j++; ++ while ((j<AllInfo.length())&&((AllInfoj>=char(32))||(AllInfoj==char(9)))) j++; + if (j<AllInfo.length()) { + Line=AllInfo.left(j); + while ((j<AllInfo.length())&&(AllInfoj<=char(32))) j++; +@@ -840,7 +840,7 @@ + QTextStream InStream(&file); + QString ffDPart; + bool EndffDPart=false; +- InStream.setCodec("UTF-8"); ++ InStream.setEncoding(QStringConverter::Utf8); + while (!InStream.atEnd()) { + QString Line=InStream.readLine(); + if (!EndffDPart) { +@@ -1089,19 +1089,19 @@ + QImage *IconImage=new QImage(); + if (IconImage->loadFromData(QByteArray((const char*)Image.pData(),Image.size()))) { + if (ImageOrientation==8) { // Rotating image anti-clockwise by 90 degrees...' +- QMatrix matrix; ++ QTransform matrix; + matrix.rotate(-90); + QImage *NewImage=new QImage(IconImage->transformed(matrix,Qt::SmoothTransformation)); + delete IconImage; + IconImage=NewImage; + } else if (ImageOrientation==3) { // Rotating image clockwise by 180 degrees...' +- QMatrix matrix; ++ QTransform matrix; + matrix.rotate(180); + QImage *NewImage=new QImage(IconImage->transformed(matrix,Qt::SmoothTransformation)); + delete IconImage; + IconImage=NewImage; + } else if (ImageOrientation==6) { // Rotating image clockwise by 90 degrees...' +- QMatrix matrix; ++ QTransform matrix; + matrix.rotate(90); + QImage *NewImage=new QImage(IconImage->transformed(matrix,Qt::SmoothTransformation)); + delete IconImage; +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/cBaseMediaFile.h ++++ ffdiaporama-2.1/src/ffDiaporama/engine/cBaseMediaFile.h +@@ -32,6 +32,7 @@ + #include <QTime> + #include <QDateTime> + #include <QImage> ++#include <QFileInfo> + + #if QT_VERSION >= 0x050000 + #include <QtSvg/QtSvg> +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/cDeviceModelDef.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/engine/cDeviceModelDef.cpp +@@ -646,7 +646,7 @@ + return false; + } + QTextStream out(&file); +- out.setCodec("UTF-8"); ++ out.setEncoding(QStringConverter::Utf8); + domDocument.save(out,4); + file.close(); + return true; +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/cDeviceModelDef.h ++++ ffdiaporama-2.1/src/ffDiaporama/engine/cDeviceModelDef.h +@@ -110,7 +110,7 @@ + #define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 + #endif + +-#if !defined(FF_API_CODEC_ID) ++/*#if !defined(FF_API_CODEC_ID) + #define AV_CODEC_ID_NONE CODEC_ID_NONE + #define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG + #define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO +@@ -133,7 +133,7 @@ + #define AV_CODEC_ID_FLAC CODEC_ID_FLAC + #define AV_CODEC_ID_WMAV1 CODEC_ID_WMAV1 + #define AV_CODEC_ID_WMAV2 CODEC_ID_WMAV2 +-#endif ++#endif*/ //ooo + + #if !defined(avcodec_free_frame) + #define avcodec_free_frame av_freep +--- ffdiaporama-2.1.orig/src/ffDiaporama/engine/cDriveList.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/engine/cDriveList.cpp +@@ -308,7 +308,7 @@ + QString Line=""; + while (AllInfo!="") { + int j=0; +- while ((j<AllInfo.length())&&((AllInfoj>=char(32))||(AllInfoj==9))) j++; ++ while ((j<AllInfo.length())&&((AllInfoj>=char(32))||(AllInfoj==char(9)))) j++; + if (j<AllInfo.length()) { + Line=AllInfo.left(j); + while ((j<AllInfo.length())&&(AllInfoj<=char(32))) j++; +@@ -373,8 +373,8 @@ + ModelFolder=ClipArtFolder; + ClipArtFolder=ClipArtFolder+"clipart"; + ModelFolder=ModelFolder+"model"; +- CAF=ClipArtFolder; if (CAF.endsWith(QDir::separator())) CAF=CAF.lastIndexOf(CAF.length()-1); +- MFD=ModelFolder; if (MFD.endsWith(QDir::separator())) MFD=MFD.lastIndexOf(MFD.length()-1); ++ CAF=ClipArtFolder; if (CAF.endsWith(QDir::separator())) CAF.remove(1,1); ++ MFD=ModelFolder; if (MFD.endsWith(QDir::separator())) MFD.remove(1,1); + } + + //==================================================================================================================== +@@ -508,7 +508,7 @@ + QString Line=""; + while (AllInfo!="") { + int j=0; +- while ((j<AllInfo.length())&&((AllInfoj>=char(32))||(AllInfoj==9))) j++; ++ while ((j<AllInfo.length())&&((AllInfoj>=char(32))||(AllInfoj==char(9)))) j++; + if (j<AllInfo.length()) { + Line=AllInfo.left(j); + while ((j<AllInfo.length())&&(AllInfoj<=char(32))) j++; +--- ffdiaporama-2.1.orig/src/ffDiaporama/ffDiaporama.pro ++++ ffdiaporama-2.1/src/ffDiaporama/ffDiaporama.pro +@@ -52,66 +52,19 @@ + DEFINES +=SHARE_DIR=\\\"$$PREFIX\\\" + + unix { ++ CONFIG += link_pkgconfig ++ PKGCONFIG += libavformat libavcodec libavutil libswscale libavdevice libavfilter libpostproc libswresample + LIBS += -L../ffDiaporama_lib + + CFLAGS += -W"Missing debug information for" + +- contains(DEFINES,Q_OS_SOLARIS) { +- +- HARDWARE_PLATFORM = $$system(uname -m) +- contains(HARDWARE_PLATFORM,x86_64) { +- DEFINES+=Q_OS_SOLARIS64 +- message("Solaris x86_64 build") +- } else { +- DEFINES+=Q_OS_SOLARIS32 +- message("Solaris x86 build") +- } +- message("Use ffmpeg in /opt/gnu/include") +- INCLUDEPATH += /opt/gnu/include +- DEFINES += USELIBSWRESAMPLE +- LIBS += -lswresample +- +- } else { +- +- HARDWARE_PLATFORM = $$system(uname -m) +- contains(HARDWARE_PLATFORM,x86_64) { +- DEFINES+=Q_OS_LINUX64 ++ HARDWARE_PLATFORM = $$system(uname -m) ++ contains(HARDWARE_PLATFORM,x86_64) { ++ DEFINES+=Q_OS_LINUX64 + message("Linux x86_64 build") +- } else { ++ } else { + DEFINES+=Q_OS_LINUX32 + message("Linux x86 build") +- } +- +- exists(/opt/ffmpeg/include/libswresample/swresample.h) { #------ conditionnaly includes from Sam Rog packages for Ubuntu +- message("Use SAM ROG Packages from /opt/ffmpeg") +- INCLUDEPATH += /opt/ffmpeg/include/ +- LIBS += -L"/opt/ffmpeg/lib" +- DEFINES += USELIBSWRESAMPLE +- LIBS += -lswresample #------ conditionnaly include libswresample +- } else:exists(/usr/include/ffmpeg/libswresample/swresample.h) { #------ Specific for Fedora +- message("Use ffmpeg in /usr/include/ffmpeg") +- DEFINES += USELIBSWRESAMPLE +- INCLUDEPATH += /usr/include/ffmpeg/ +- LIBS += -lswresample #------ conditionnaly include libswresample +- } else:exists(/usr/include/libswresample/swresample.h) { #------ Specific for openSUSE +- message("Use ffmpeg in /usr/include") +- INCLUDEPATH += /usr/include/ +- DEFINES += USELIBSWRESAMPLE +- LIBS += -lswresample #------ conditionnaly include libswresample +- } else:exists(/usr/include/libavresample/avresample.h) { +- message("Use libav 9 in /usr/include") +- DEFINES += USELIBAVRESAMPLE +- LIBS += -lavresample #------ conditionnaly include libavresample +- INCLUDEPATH += /usr/include/ +- } else { +- message("Use libav 0.8+taglib in /usr/include") +- LIBS += -ltag #------ TAGlib is used only with LIBAV 8 +- DEFINES += USETAGLIB +- DEFINES += HAVE_CONFIG_H #------ specific for TAGLib +- DEFINES += TAGLIB_STATIC #------ specific for TAGLib +- INCLUDEPATH += /usr/include/ +- } +- + } + + LIBS += -lexiv2 #------ Exiv2 +--- ffdiaporama-2.1.orig/src/ffDiaporama/wgt_QMultimediaBrowser/QCustomFolderTable.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/wgt_QMultimediaBrowser/QCustomFolderTable.cpp +@@ -913,9 +913,9 @@ + + // Sort files in the fileList + bShowFoldersFirst=ShowFoldersFirst; +- if (SortFile==SORTORDER_BYNUMBER) qSort(MediaList.begin(),MediaList.end(),ByNumber); +- else if (SortFile==SORTORDER_BYNAME) qSort(MediaList.begin(),MediaList.end(),ByName); +- else if (SortFile==SORTORDER_BYDATE) qSort(MediaList.begin(),MediaList.end(),ByDate); ++ if (SortFile==SORTORDER_BYNUMBER) std::sort(MediaList.begin(),MediaList.end(),ByNumber); ++ else if (SortFile==SORTORDER_BYNAME) std::sort(MediaList.begin(),MediaList.end(),ByName); ++ else if (SortFile==SORTORDER_BYDATE) std::sort(MediaList.begin(),MediaList.end(),ByDate); + + //********************************************************** + +@@ -925,7 +925,8 @@ + setUpdatesEnabled(true); + + // Start thread to scan files +- ScanMediaList.setFuture(QtConcurrent::run(this,&QCustomFolderTable::DoScanMediaList)); ++ //ScanMediaList.setFuture(QtConcurrent::run(&QCustomFolderTable::DoScanMediaList,this)); //ooo ++ QCustomFolderTable::DoScanMediaList(); //xxx + + QApplication::restoreOverrideCursor(); + SaveSettings(); +@@ -1054,7 +1055,7 @@ + Painter.setFont(font); + + QFontMetrics fm =Painter.fontMetrics(); +- int Size=fm.width(TextToDisplay)+4+DecalX; ++ int Size=fm.horizontalAdvance(TextToDisplay)+4+DecalX; + if (ColSizeCol<Size) ColSizeCol=Size; + } + Painter.end(); +--- ffdiaporama-2.1.orig/src/ffDiaporama/wgt_QMultimediaBrowser/QCustomFolderTable.h ++++ ffdiaporama-2.1/src/ffDiaporama/wgt_QMultimediaBrowser/QCustomFolderTable.h +@@ -30,6 +30,7 @@ + // Include some common various class + #include "engine/cApplicationConfig.h" + #include "engine/cBaseMediaFile.h" ++#include "engine/_Variables.h" + + //************************************************************* + // Define action types for Settings menu +--- ffdiaporama-2.1.orig/src/ffDiaporama/wgt_QMultimediaBrowser/wgt_QMultimediaBrowser.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/wgt_QMultimediaBrowser/wgt_QMultimediaBrowser.cpp +@@ -608,7 +608,7 @@ + #endif + QString SrcFolder =FolderPath; + QString SubFolderName=FolderPath; +- if (SubFolderName.endsWith(QDir::separator())) SubFolderName=SubFolderName.lastIndexOf(SubFolderName.length()-1); ++ if (SubFolderName.endsWith(QDir::separator())) SubFolderName=SubFolderName.left(SubFolderName.length()-1); + if (SubFolderName.indexOf(QDir::separator())!=-1) { + FolderPath=FolderPath.left(FolderPath.lastIndexOf(QDir::separator())); + SubFolderName=SubFolderName.mid(SubFolderName.lastIndexOf(QDir::separator())+1); +--- ffdiaporama-2.1.orig/src/ffDiaporama/wgt_QMultimediaBrowser/wgt_QMultimediaBrowser.h ++++ ffdiaporama-2.1/src/ffDiaporama/wgt_QMultimediaBrowser/wgt_QMultimediaBrowser.h +@@ -23,6 +23,7 @@ + + // Basic inclusions (common to all files) + #include "engine/_GlobalDefines.h" ++#include "engine/_Variables.h" + #include "engine/cApplicationConfig.h" + #include "engine/cDriveList.h" + #include "QCustomFolderTable.h" +--- ffdiaporama-2.1.orig/src/ffDiaporama/wgt_QVideoPlayer/QCustomRuler.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/wgt_QVideoPlayer/QCustomRuler.cpp +@@ -85,7 +85,7 @@ + + double Width = double(this->width()); + double Height = double(this->height()); +- int WidthTick = Painter.fontMetrics().width("00:00"); ++ int WidthTick = Painter.fontMetrics().horizontalAdvance("00:00"); + + //******************************************************** + // Draw slider background +--- ffdiaporama-2.1.orig/src/ffDiaporama/wgt_QVideoPlayer/wgt_QVideoPlayer.cpp ++++ ffdiaporama-2.1/src/ffDiaporama/wgt_QVideoPlayer/wgt_QVideoPlayer.cpp +@@ -511,8 +511,8 @@ + #endif + // specific case for windows because never a timer event can happens if a previous timer event was not ended + // so next trylock is always true +- int Elapsed=0,Wanted=int(double(1000)/WantedFPS); +- if (!PreviousTimerEvent.isValid()) PreviousTimerEvent.start(); else Elapsed=PreviousTimerEvent.restart(); ++ /*int Elapsed=0,Wanted=int(double(1000)/WantedFPS); ++ if (!PreviousTimerEvent.isValid()) PreviousTimerEvent.start(); else Elapsed=PreviousTimerEvent.start(); + if (Elapsed>Wanted) { + TimerDelta+=Elapsed-Wanted; + if (TimerDelta>=Wanted) { +@@ -526,7 +526,7 @@ + } + TimerDelta-=Wanted; + } +- } ++ }*/ + } + #ifdef Q_OS_WIN + PlayerMutex.lock(); +@@ -612,7 +612,7 @@ + + cDiaporamaObjectInfo *NewFrame=new cDiaporamaObjectInfo(PreviousFrame,NextPosition,NULL,int(double(1000)/WantedFPS),true); + NewFrame->CurrentObject_StartTime =0; +- ThreadPrepareVideo.setFuture(QtConcurrent::run(this,&wgt_QVideoPlayer::PrepareVideoFrame,NewFrame,NewFrame->CurrentObject_InObjectTime)); ++ ThreadPrepareVideo.setFuture(QtConcurrent::run(&wgt_QVideoPlayer::PrepareVideoFrame,this,NewFrame,NewFrame->CurrentObject_InObjectTime)); + + } else if (((Diaporama)&&(ImageList.List.count()<BUFFERING_NBR_FRAME))&&(!ThreadPrepareImage.isRunning())) { + +@@ -644,7 +644,7 @@ + int W=int(H*Ratio); + if ((Frame->IsTransition)&&(Frame->TransitObject)) Diaporama->CreateObjectContextList(Frame,W,H,false,true,true,PreparedTransitBrushList,Diaporama); + Diaporama->CreateObjectContextList(Frame,W,H,true,true,true,PreparedBrushList,Diaporama); +- ThreadPrepareImage.setFuture(QtConcurrent::run(this,&wgt_QVideoPlayer::PrepareImage,true,true,Frame,W,H)); ++ ThreadPrepareImage.setFuture(QtConcurrent::run(&wgt_QVideoPlayer::PrepareImage,this,true,true,Frame,W,H)); + } + + PlayerMutex.unlock(); +@@ -670,7 +670,7 @@ + Diaporama->LoadSources(Frame,W,H,true,AddStartPos,PreparedTransitBrushList,PreparedBrushList); + + // Do Assembly +- ThreadAssembly.setFuture(QtConcurrent::run(this,&wgt_QVideoPlayer::StartThreadAssembly,ComputePCT(Frame->CurrentObject?Frame->CurrentObject->GetSpeedWave():0,Frame->TransitionPCTDone),Frame,W,H,SoundWanted)); ++ ThreadAssembly.setFuture(QtConcurrent::run(&wgt_QVideoPlayer::StartThreadAssembly,this,ComputePCT(Frame->CurrentObject?Frame->CurrentObject->GetSpeedWave():0,Frame->TransitionPCTDone),Frame,W,H,SoundWanted)); + } + + void wgt_QVideoPlayer::StartThreadAssembly(double PCT,cDiaporamaObjectInfo *Frame,int W,int H,bool SoundWanted) { +--- ffdiaporama-2.1.orig/src/ffDiaporama_lib/cBaseBrushDefinition.cpp ++++ ffdiaporama-2.1/src/ffDiaporama_lib/cBaseBrushDefinition.cpp +@@ -53,7 +53,7 @@ + ApplicationConfig =AppConfig; + qlonglong FolderKey =ApplicationConfig->FoldersTable->GetFolderKey(QFileInfo(FileName).absolutePath()); + IsValide =false; +- ModifDateTime =QFileInfo(FileName).created(); ++ ModifDateTime =QFileInfo(FileName).birthTime(); + Name =QFileInfo(FileName).baseName(); + FileKey =ApplicationConfig->FilesTable->GetFileKey(FolderKey,QFileInfo(FileName).fileName(),OBJECTTYPE_IMAGEFILE); + +--- ffdiaporama-2.1.orig/src/ffDiaporama_lib/cDatabase.cpp ++++ ffdiaporama-2.1/src/ffDiaporama_lib/cDatabase.cpp +@@ -24,7 +24,7 @@ + + void DisplayLastSQLError(QSqlQuery *Query) { + ToLog(LOGMSG_CRITICAL,Query->lastQuery()); +- ToLog(LOGMSG_CRITICAL,QString("Error %1:%2").arg(Query->lastError().number()).arg(Query->lastError().text())); ++ ToLog(LOGMSG_CRITICAL,QString("Error %1:%2").arg(Query->lastError().nativeErrorCode().toInt()).arg(Query->lastError().text())); + } + + //************************************************************************************************************************** +@@ -152,7 +152,7 @@ + if (!Ret) DisplayLastSQLError(&Query); + return Ret; + } else { +- if (Query.lastError().number()==1) return CreateTable(); else { ++ if (Query.lastError().nativeErrorCode().toInt()==1) return CreateTable(); else { + DisplayLastSQLError(&Query); + return false; + } +@@ -490,7 +490,7 @@ + Query.bindValue(":Key", FileKey, QSql::In); + Query.bindValue(":Timestamp", FileInfo.lastModified().toMSecsSinceEpoch(), QSql::In); + Query.bindValue(":CreatDateTime",FileInfo.lastModified(), QSql::In); +- Query.bindValue(":ModifDateTime",FileInfo.created(), QSql::In); ++ Query.bindValue(":ModifDateTime",FileInfo.birthTime(), QSql::In); + Query.bindValue(":FileSize", FileInfo.size(), QSql::In); + Query.bindValue(":MediaFileType",MediaFileType, QSql::In); + if (!Query.exec()) DisplayLastSQLError(&Query); +@@ -509,7 +509,7 @@ + Query.bindValue(":IsHidden", FileInfo.isHidden()||FileInfo.fileName().startsWith(".")?1:0, QSql::In); + Query.bindValue(":IsDir", FileInfo.isDir()?1:0, QSql::In); + Query.bindValue(":CreatDateTime",FileInfo.lastModified(), QSql::In); +- Query.bindValue(":ModifDateTime",FileInfo.created(), QSql::In); ++ Query.bindValue(":ModifDateTime",FileInfo.birthTime(), QSql::In); + Query.bindValue(":FileSize", FileInfo.size(), QSql::In); + Query.bindValue(":MediaFileType",MediaFileType, QSql::In); + Ret=Query.exec(); +@@ -600,7 +600,7 @@ + Query2.bindValue(":Key", FileKey, QSql::In); + Query2.bindValue(":Timestamp", NewTimestamp, QSql::In); + Query2.bindValue(":CreatDateTime",FileInfo.lastModified().toString(Qt::ISODate),QSql::In); +- Query2.bindValue(":ModifDateTime",FileInfo.created().toString(Qt::ISODate), QSql::In); ++ Query2.bindValue(":ModifDateTime",FileInfo.birthTime().toString(Qt::ISODate), QSql::In); + Query2.bindValue(":FileSize", FileInfo.size(), QSql::In); + if (!Query2.exec()) DisplayLastSQLError(&Query2); + NbrModif++; +@@ -988,10 +988,10 @@ + + if (OldVersion<=4) { + Ret=Query.exec("DROP TABLE Location"); +- if ((!Ret)&&(Query.lastError().number()==1)) Ret=true; ++ if ((!Ret)&&(Query.lastError().nativeErrorCode().toInt()==1)) Ret=true; + } else if (OldVersion==5) { + Ret=Query.exec("ALTER TABLE Location ADD COLUMN FAddress text"); +- if ((!Ret)&&(Query.lastError().number()==1)) Ret=true; ++ if ((!Ret)&&(Query.lastError().nativeErrorCode().toInt()==1)) Ret=true; + } + + if (!Ret) DisplayLastSQLError(&Query); +--- ffdiaporama-2.1.orig/src/ffDiaporama_lib/cLuLoImageCache.cpp ++++ ffdiaporama-2.1/src/ffDiaporama_lib/cLuLoImageCache.cpp +@@ -94,7 +94,7 @@ + // If image is ok then apply exif orientation (if needed) + if (CacheRenderImage) { + if (ImageOrientation==8) { // Rotating image anti-clockwise by 90 degrees...' +- QMatrix matrix; ++ QTransform matrix; + matrix.rotate(-90); + QImage *NewImage=new QImage(CacheRenderImage->transformed(matrix,Smoothing?Qt::SmoothTransformation:Qt::FastTransformation)); + if (NewImage) { +@@ -104,7 +104,7 @@ + } + } + } else if (ImageOrientation==3) { // Rotating image clockwise by 180 degrees...' +- QMatrix matrix; ++ QTransform matrix; + matrix.rotate(180); + QImage *NewImage=new QImage(CacheRenderImage->transformed(matrix,Smoothing?Qt::SmoothTransformation:Qt::FastTransformation)); + if (NewImage) { +@@ -114,7 +114,7 @@ + } + } + } else if (ImageOrientation==6) { // Rotating image clockwise by 90 degrees...' +- QMatrix matrix; ++ QTransform matrix; + matrix.rotate(90); + QImage *NewImage=new QImage(CacheRenderImage->transformed(matrix,Smoothing?Qt::SmoothTransformation:Qt::FastTransformation)); + if (NewImage) { +@@ -134,7 +134,7 @@ + + } + if (CacheRenderImage==NULL) ToLog(LOGMSG_CRITICAL,"Error in cLuLoImageCacheObject::ValidateCacheRenderImage() : return NULL"); +- ByteCount=((CacheRenderImage)?CacheRenderImage->byteCount():0)+(((CachePreviewImage)&&(CachePreviewImage!=CacheRenderImage))?CachePreviewImage->byteCount():0); ++ ByteCount=((CacheRenderImage)?CacheRenderImage->sizeInBytes():0)+(((CachePreviewImage)&&(CachePreviewImage!=CacheRenderImage))?CachePreviewImage->sizeInBytes():0); + MemoryMutex.unlock(); + return (CacheRenderImage?*CacheRenderImage:QImage()); + } +@@ -197,7 +197,7 @@ + + if (CachePreviewImage) { + if (ImageOrientation==8) { // Rotating image anti-clockwise by 90 degrees...' +- QMatrix matrix; ++ QTransform matrix; + matrix.rotate(-90); + QImage *NewImage=new QImage(CachePreviewImage->transformed(matrix,Smoothing?Qt::SmoothTransformation:Qt::FastTransformation)); + if (NewImage) { +@@ -207,7 +207,7 @@ + } + } + } else if (ImageOrientation==3) { // Rotating image clockwise by 180 degrees...' +- QMatrix matrix; ++ QTransform matrix; + matrix.rotate(180); + QImage *NewImage=new QImage(CachePreviewImage->transformed(matrix,Smoothing?Qt::SmoothTransformation:Qt::FastTransformation)); + if (NewImage) { +@@ -217,7 +217,7 @@ + } + } + } else if (ImageOrientation==6) { // Rotating image clockwise by 90 degrees...' +- QMatrix matrix; ++ QTransform matrix; + matrix.rotate(90); + QImage *NewImage=new QImage(CachePreviewImage->transformed(matrix,Smoothing?Qt::SmoothTransformation:Qt::FastTransformation)); + if (NewImage) { +@@ -240,7 +240,7 @@ + + } + if (CachePreviewImage==NULL) ToLog(LOGMSG_CRITICAL,"Error in cLuLoImageCacheObject::CachePreviewImage() : return NULL"); +- ByteCount=((CacheRenderImage)?CacheRenderImage->byteCount():0)+(((CachePreviewImage)&&(CachePreviewImage!=CacheRenderImage))?CachePreviewImage->byteCount():0); ++ ByteCount=((CacheRenderImage)?CacheRenderImage->sizeInBytes():0)+(((CachePreviewImage)&&(CachePreviewImage!=CacheRenderImage))?CachePreviewImage->sizeInBytes():0); + QImage *Ret=(CachePreviewImage)?new QImage(CachePreviewImage->copy()):NULL; + MemoryMutex.unlock(); + return Ret;
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.