Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

videoplayer new

Browse Source
This commit is contained in:
Rmys
2021-02-13 17:25:59 +03:00
parent 7c3a5646f7
commit 798430e11a
99 changed files with 262777 additions and 290548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/videoplayer/smplayer/files/Fix_control_problem_with_mpv-0.30.patch
+36
View File
@@ -0,0 +1,36 @@
Index: src/mpvprocess.cpp
===================================================================
--- src/mpvprocess.cpp (revision 9231)
+++ src/mpvprocess.cpp (revision 9232)
@@ -122,7 +122,7 @@
void MPVProcess::initializeRX() {
#ifdef CUSTOM_STATUS
- rx_av.setPattern("^STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)");
+ rx_av.setPattern("STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)");
#else
rx_av.setPattern("^(\\((.*)\\) |)(AV|V|A): ([0-9]+):([0-9]+):([0-9]+) / ([0-9]+):([0-9]+):([0-9]+)"); //AV: 00:02:15 / 00:09:56
#endif
@@ -197,7 +197,7 @@
static double last_sec = -1;
// Parse A: V: line
- //qDebug("MPVProcess::parseLine: %s", line.toUtf8().data());
+ //qDebug() << "MPVProcess::parseLine:" << line;
if (rx_av.indexIn(line) > -1) {
#ifdef CUSTOM_STATUS
double sec = rx_av.cap(1).toDouble();
Index: src/mpvoptions.cpp
===================================================================
--- src/mpvoptions.cpp (revision 9233)
+++ src/mpvoptions.cpp (revision 9234)
@@ -63,7 +63,8 @@
arg << "--term-playing-msg="
"MPV_VERSION=${=mpv-version:}\n"
"INFO_VIDEO_WIDTH=${=width}\nINFO_VIDEO_HEIGHT=${=height}\n"
- "INFO_VIDEO_ASPECT=${=video-aspect}\n"
+// "INFO_VIDEO_ASPECT=${=video-aspect}\n" // old
+ "INFO_VIDEO_ASPECT=${=video-params/aspect}\n"
// "INFO_VIDEO_DSIZE=${=dwidth}x${=dheight}\n"
"INFO_VIDEO_FPS=${=container-fps:${=fps}}\n"
// "INFO_VIDEO_BITRATE=${=video-bitrate}\n"
multimedia/videoplayer/smplayer/files/desktop.patch
+20
View File
@@ -0,0 +1,20 @@
Index: smplayer-0.6.8/smplayer.desktop
===================================================================
--- smplayer-0.6.8.orig/smplayer.desktop
+++ smplayer-0.6.8/smplayer.desktop
@@ -10,6 +10,7 @@ Comment[nl]=Een uitstekend frontend voor
Comment[pl]=Świetna nakładka na Mplayer
Comment[pt]=Um óptimo interface gráfico para o MPlayer
Comment[ru]=Мощный интерфейс к MPlayer
+Comment[tr]=Gelişmiş bir MPlayer önyüzü
Comment[uk]=Потужний інтерфейс до MPlayer
Exec=smplayer %U
GenericName=Media Player
@@ -18,6 +19,7 @@ GenericName[es]=Reproductor multimedia
GenericName[hu]=Médialejátszó
GenericName[pt]=Reprodutor de Média
GenericName[ru]=Медиаплеер
+GenericName[tr]=Çokluortam Oynatıcı
GenericName[uk]=Програвач медіа
Icon=smplayer
MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;
multimedia/videoplayer/smplayer/files/fix-subtitle-encodings.patch
+13
View File
@@ -0,0 +1,13 @@
Index: smplayer-0.6.7_20090703/src/preferences.cpp
===================================================================
--- smplayer-0.6.7_20090703.orig/src/preferences.cpp
+++ smplayer-0.6.7_20090703/src/preferences.cpp
@@ -179,7 +179,7 @@ void Preferences::reset() {
font_file = "";
font_name = "";
use_fontconfig = false;
- subcp = "ISO-8859-1";
+ subcp = "cp1254";
use_enca = false;
enca_lang = QString(QLocale::system().name()).section("_",0,0);
font_autoscale = 1;
multimedia/videoplayer/smplayer/files/index.html
+17
View File
@@ -0,0 +1,17 @@
<html><head><title>kde-48-pisi - Revision 691: /trunk/ext-apps/SMPlayer/files</title></head>
<body>
<h2>kde-48-pisi - Revision 691: /trunk/ext-apps/SMPlayer/files</h2>
<ul>
<li><a href="../">..</a></li>
<li><a href="default-to-oxygen-air.patch">default-to-oxygen-air.patch</a></li>
<li><a href="desktop.patch">desktop.patch</a></li>
<li><a href="fix-subtitle-encodings.patch">fix-subtitle-encodings.patch</a></li>
<li><a href="make-default-video-player.diff">make-default-video-player.diff</a></li>
<li><a href="shape_mplayer_output.patch">shape_mplayer_output.patch</a></li>
<li><a href="smplayer_dvd.desktop">smplayer_dvd.desktop</a></li>
<li><a href="smplayer_vcd.desktop">smplayer_vcd.desktop</a></li>
<li><a href="use-sans-instead-of-arial.patch">use-sans-instead-of-arial.patch</a></li>
<li><a href="workaround-for-qaction.diff">workaround-for-qaction.diff</a></li>
</ul>
<hr noshade><em><a href="http://code.google.com/">Google Code</a> powered by <a href="http://subversion.apache.org/">Subversion</a></em>
</body></html>
multimedia/videoplayer/smplayer/files/make-default-video-player.diff
+13
View File
@@ -0,0 +1,13 @@
diff -Naur smplayer-0.6.7_20090703-orig/smplayer.desktop smplayer-0.6.7_20090703/smplayer.desktop
--- smplayer-0.6.7_20090703-orig/smplayer.desktop 2009-07-17 14:05:03.125530048 +0300
+++ smplayer-0.6.7_20090703/smplayer.desktop 2009-07-17 14:38:51.968427462 +0300
@@ -22,7 +22,8 @@
GenericName[uk]=Потужний інтерфейс до MPlayer
GenericName[tr]=Gelişmiş bir MPlayer önyüzü
Icon=smplayer
-MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;
+MimeType=video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;
+InitialPreference=14
Name=SMPlayer
Type=Application
X-KDE-StartupNotify=false
multimedia/videoplayer/smplayer/files/shape_mplayer_output.patch
+57
View File
@@ -0,0 +1,57 @@
diff -Nur smplayer-0.6.6-old/src/core.cpp smplayer-0.6.6/src/core.cpp
--- smplayer-0.6.6-old/src/core.cpp 2008-12-30 01:43:28.000000000 +0200
+++ smplayer-0.6.6/src/core.cpp 2009-01-02 05:41:54.000000000 +0200
@@ -1192,6 +1192,8 @@
proc->addArgument( mplayer_bin );
proc->addArgument("-noquiet");
+ proc->addArgument("-nomsgcolor");
+ proc->addArgument("-nomsgmodule");
if (pref->fullscreen && pref->use_mplayer_window) {
proc->addArgument("-fs");
diff -Nur smplayer-0.6.6-old/src/infoprovider.cpp smplayer-0.6.6/src/infoprovider.cpp
--- smplayer-0.6.6-old/src/infoprovider.cpp 2008-10-13 11:14:07.000000000 +0300
+++ smplayer-0.6.6/src/infoprovider.cpp 2009-01-02 05:41:54.000000000 +0200
@@ -40,6 +40,8 @@
proc.addArgument("null");
proc.addArgument("-ao");
proc.addArgument("null");
+ proc.addArgument("-nomsgcolor");
+ proc.addArgument("-nomsgmodule");
proc.addArgument(filename);
proc.start();
diff -Nur smplayer-0.6.6-old/src/inforeader.cpp smplayer-0.6.6/src/inforeader.cpp
--- smplayer-0.6.6-old/src/inforeader.cpp 2008-07-05 02:53:21.000000000 +0300
+++ smplayer-0.6.6/src/inforeader.cpp 2009-01-02 05:41:54.000000000 +0200
@@ -77,7 +77,7 @@
demuxer_list.clear();
mplayer_svn = -1;
- run("-identify -vo help -ao help -demuxer help -vc help -ac help");
+ run("-identify -vo help -ao help -demuxer help -vc help -ac help -nomsgcolor -nomsgmodule");
//list();
}
diff -Nur smplayer-0.6.6-old/src/videopreview/videopreview.cpp smplayer-0.6.6/src/videopreview/videopreview.cpp
--- smplayer-0.6.6-old/src/videopreview/videopreview.cpp 2008-12-22 02:50:55.000000000 +0200
+++ smplayer-0.6.6/src/videopreview/videopreview.cpp 2009-01-02 05:41:54.000000000 +0200
@@ -262,6 +262,8 @@
bool VideoPreview::runMplayer(int seek, double aspect_ratio) {
QStringList args;
args << "-nosound";
+ args << "-nomsgcolor";
+ args << "-nomsgmodule";
if (prop.extract_format == PNG) {
args << "-vo"
@@ -442,7 +444,7 @@
p.setProcessChannelMode( QProcess::MergedChannels );
QStringList args;
- args << "-vo" << "null" << "-ao" << "null" << "-frames" << "1" << "-identify" << "-nocache" << "-noquiet" << filename;
+ args << "-vo" << "null" << "-ao" << "null" << "-frames" << "1" << "-identify" << "-nocache" << "-noquiet" << "-nomsgcolor" << "-nomsgmodule" << filename;
if (!prop.dvd_device.isEmpty()) {
args << "-dvd-device" << prop.dvd_device;
multimedia/videoplayer/smplayer/files/smplayer_dvd.desktop
+11
View File
@@ -0,0 +1,11 @@
[Desktop Entry]
X-KDE-Solid-Predicate=[StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoDvd']
Actions=SMplayer;
Type=Service
X-KDE-Priority=TopLevel
[Desktop Action SMplayer]
Name=Play DVD
Name[tr]=DVD'yi Oynat
Exec=smplayer dvdnav:///%d
Icon=smplayer
multimedia/videoplayer/smplayer/files/smplayer_vcd.desktop
+11
View File
@@ -0,0 +1,11 @@
[Desktop Entry]
X-KDE-Solid-Predicate=[StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoCd']
Actions=SMplayer;
Type=Service
X-KDE-Priority=TopLevel
[Desktop Action SMplayer]
Name=Play VCD
Name[tr]=VCD'yi Oynat
Exec=smplayer vcd:///%d
Icon=smplayer
multimedia/videoplayer/smplayer/files/tr.diff
+3150
View File
File diff suppressed because it is too large Load Diff
multimedia/videoplayer/smplayer/files/use-sans-instead-of-arial.patch
+26
View File
@@ -0,0 +1,26 @@
Index: smplayer-0.6.7_20090703/src/assstyles.cpp
===================================================================
--- smplayer-0.6.7_20090703.orig/src/assstyles.cpp
+++ smplayer-0.6.7_20090703/src/assstyles.cpp
@@ -23,7 +23,7 @@
#include "colorutils.h"
AssStyles::AssStyles() {
- fontname = "Arial";
+ fontname = "Sans";
fontsize = 20;
primarycolor = 0xFFFFFF;
backcolor = 0;
Index: smplayer-0.6.7_20090703/src/videopreview/videopreview.cpp
===================================================================
--- smplayer-0.6.7_20090703.orig/src/videopreview/videopreview.cpp
+++ smplayer-0.6.7_20090703/src/videopreview/videopreview.cpp
@@ -339,7 +339,7 @@ bool VideoPreview::addPicture(const QStr
// Add current time text
if (prop.display_osd) {
QString stime = QTime().addSecs(time).toString("hh:mm:ss");
- QFont font("Arial");
+ QFont font("Sans");
font.setBold(true);
QPainter painter(&scaled_picture);
painter.setPen( Qt::white );
multimedia/videoplayer/smplayer/files/workaround-for-qaction.diff
+21
View File
@@ -0,0 +1,21 @@
Index: smplayer-0.6.9_20100211/src/myaction.cpp
===================================================================
--- smplayer-0.6.9_20100211.orig/src/myaction.cpp
+++ smplayer-0.6.9_20100211/src/myaction.cpp
@@ -72,14 +72,14 @@ void MyAction::change(const QIcon & icon
}
void MyAction::change(const QString & text ) {
- setText( text );
+ setText( text.trimmed() );
QString accel_text = shortcut().toString();
QString s = text;
s.replace("&","");
if (!accel_text.isEmpty()) {
- setToolTip( s + " ("+ accel_text +")");
+ setToolTip( s.trimmed() + " ("+ tr(accel_text.toAscii().constData()) +")");
setIconText( s );
}