2.0 linux build

rupeshs · Nov 7, 2016 · 19b59f6 · 19b59f6
1 parent 3b5d34d
commit 19b59f6
Show file tree

Hide file tree

Showing 11 changed files with 4,327 additions and 602 deletions.
diff --git a/Makefile b/Makefile
diff --git a/NeuralStyler.pro.user b/NeuralStyler.pro.user
diff --git a/aboutdialog.ui b/aboutdialog.ui
@@ -6,20 +6,20 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>425</width>
-    <height>173</height>
+    <width>500</width>
+    <height>200</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>425</width>
-    <height>173</height>
+    <width>500</width>
+    <height>200</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>425</width>
-    <height>173</height>
+    <width>500</width>
+    <height>200</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -32,8 +32,8 @@
   <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
     <rect>
-     <x>70</x>
-     <y>130</y>
+     <x>100</x>
+     <y>160</y>
      <width>341</width>
      <height>32</height>
     </rect>
@@ -50,8 +50,8 @@
     <rect>
      <x>140</x>
      <y>20</y>
-     <width>301</width>
-     <height>121</height>
+     <width>351</width>
+     <height>141</height>
     </rect>
    </property>
    <property name="text">

diff --git a/ffmpegprocess.cpp b/ffmpegprocess.cpp
@@ -23,7 +23,7 @@ FfmpegProcess::FfmpegProcess()
 }
 void FfmpegProcess::startFfmpeg()
 {
-    qDebug()<<arguments();
+    //qDebug()<<arguments();
     strFps="";
 
 #ifdef Q_OS_WIN

diff --git a/mplayer.cpp b/mplayer.cpp
@@ -49,7 +49,11 @@ void Mplayer::setVideoWin(long int id)
     argfrontEnd<<"-wid"<<QString::number(id);
 
 }
+void Mplayer::setScaling(int width,int height)
+{
+    argfrontEnd<<"-vf"<<"scale="+QString::number(width)+":"+QString::number(height);
 
+}
 void Mplayer::play(QString filepath)
 {
     mProcess->clearArguments();
@@ -76,7 +80,7 @@ void Mplayer::play(QString filepath)
         mProcess->addArgument(strArgument);
     }
 
-   // qDebug()<< mProcess->arguments();
+   //qDebug()<< mProcess->arguments();
 
     mProcess->start();
 

diff --git a/mplayer.h b/mplayer.h
@@ -39,6 +39,7 @@ public slots:
     void mplayerConsole(QByteArray ba);
     void setMplayerPath(QString path){mplayerPath=path;}
     void setVideoWin(long id);
+    void setScaling(int width,int height);
     void play(QString filepath);
     QString parsevalue( QString serstr,QString sep,QString str);
     void  command(QString cmd);

diff --git a/neuralstyler b/neuralstyler