Packman Build Service PMBS

screengen.changes Changed

screengen.spec Changed

screengen-1.5-20120919.tar.bz2/CHANGELOG -> screengen-1.6-20121122.tar.bz2/CHANGELOG Changed

screengen-1.5-20120919.tar.bz2/screengen_ru_RU.qm -> screengen-1.6-20121122.tar.bz2/screengen_ru_RU.qm Changed

screengen-1.5-20120919.tar.bz2/screengen_ru_RU.ts -> screengen-1.6-20121122.tar.bz2/screengen_ru_RU.ts Changed

@@ -4,60 +4,65 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/main.cpp" line="292"/>
+        <location filename="src/main.cpp" line="338"/>
         <source>Mb</source>
         <translation>Мб</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="313"/>
+        <location filename="src/main.cpp" line="358"/>
         <source>File name:</source>
         <translation>Имя файла:</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="315"/>
+        <location filename="src/main.cpp" line="360"/>
         <source>Size:</source>
         <translation>Размер:</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="317"/>
+        <location filename="src/main.cpp" line="362"/>
         <source>General info:</source>
         <translation>Информация:</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="319"/>
+        <location filename="src/main.cpp" line="364"/>
         <source>Video:</source>
         <translation>Видео:</translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="321"/>
+        <location filename="src/main.cpp" line="366"/>
         <source>Audio:</source>
         <translation>Аудио:</translation>
     </message>
     <message>
-        <location filename="src/qffmpeg.cpp" line="14"/>
-        <location filename="src/qffmpeg.cpp" line="93"/>
+        <location filename="src/qffmpeg.cpp" line="15"/>
+        <location filename="src/qffmpeg.cpp" line="100"/>
         <source>kb/s</source>
         <translation>кбит/с</translation>
     </message>
     <message>
-        <location filename="src/qffmpeg.cpp" line="14"/>
+        <location filename="src/qffmpeg.cpp" line="15"/>
         <source>Streams:</source>
         <translation>Потоков:</translation>
     </message>
     <message>
-        <location filename="src/qffmpeg.cpp" line="14"/>
+        <location filename="src/qffmpeg.cpp" line="15"/>
         <source>Full bitrate:</source>
         <translation>Общий битрейт:</translation>
     </message>
     <message>
-        <location filename="src/qffmpeg.cpp" line="87"/>
+        <location filename="src/qffmpeg.cpp" line="92"/>
         <source>fps</source>
         <translation>кадров/с</translation>
     </message>
     <message>
-        <location filename="src/qffmpeg.cpp" line="94"/>
+        <location filename="src/qffmpeg.cpp" line="101"/>
         <source>kHz</source>
         <translation>кГц</translation>
     </message>
+    <message>
+        <location filename="src/qffmpeg.cpp" line="103"/>
+        <source>Not present</source>
+        <translation>Отсутствует</translation>
+    </message>
 </context>
 </TS>

screengen-1.5-20120919.tar.bz2/src/main.cpp -> screengen-1.6-20121122.tar.bz2/src/main.cpp Changed

@@ -20,7 +20,7 @@
 	translator.load ("screengen_"+QLocale::system().name()+".qm","/usr/share/screengen/translations/");
 	app.installTranslator (&translator);
 
-	qDebug()<<"Screenlist generator from video file. Version 1.5. Copyright (C) 2012 Oleg Kochkin. License - GPL.";
+	qDebug()<<"Screenlist generator from video file. Version 1.6. Copyright (C) 2012 Oleg Kochkin. License - GPL.";
 // Видеофайл
 	QString videoFile = "";
 // Секция предустановок
@@ -29,6 +29,9 @@
 
 	QSettings cfg("screengen","screengen");
 	cfg.beginGroup(preset);
+	
+	bool presetsList=false;
+	QString presetInfo="";
 
 	int frames=cfg.value ("frames",16).toInt();// Всего кадров
 	int widthList=cfg.value ("width",1200).toInt();// Ширина листа
@@ -174,40 +177,60 @@
 	if (QString(argv[i]) == "--descr") descr=QString(argv[i+1]);
 	if (QString(argv[i]) == "--stampOffset") stampOffset=QString(argv[i+1]).toInt();
 	if (QString(argv[i]) == "--outFolder") outFolder=QString(argv[i+1]);
+	if (QString(argv[i]) == "--aspect") aspect=QString(argv[i+1]).toDouble();
+	if (QString(argv[i]) == "--stampPos")	stampPos=QString(argv[i+1]);
+	if (QString(argv[i]) == "--frameBoxColor") frameBoxColor=QString(argv[i+1]);
+	if (QString(argv[i]) == "--frameBox") frameBox=QString(argv[i+1]).toInt();
+	if (QString(argv[i]) == "--stampDescrPos")	stampDescrPos=QString(argv[i+1]);
+	if (QString(argv[i]) == "--stampDescr")	stampDescr=QString(argv[i+1]);
+	if (QString(argv[i]) == "--fontFrameWeight") QString fontFrameWeightS=QString(argv[i+1]);
+	if (QString(argv[i]) == "--fontHeaderWeight") QString fontHeaderWeightS=QString(argv[i+1]);
+	if (QString(argv[i]) == "--presetsList") presetsList=true;
+	if (QString(argv[i]) == "--presetInfo") presetInfo=QString(argv[i+1]);
+
 	if (QString(argv[i]) == "--header") {
-		QString h=QString(argv[i+1]);
-		if (h == "true") header=true;
+		if (QString(argv[i+1]) == "true") header=true;
 		else header=false;
 		}
 	if (QString(argv[i]) == "--timeFrame") {
-		QString h=QString(argv[i+1]);
-		if (h == "true") timeFrame=true;
+		if (QString(argv[i+1]) == "true") timeFrame=true;
 		else timeFrame=false;
 		}
-	if (QString(argv[i]) == "--fontFrameWeight") QString fontFrameWeightS=QString(argv[i+1]);
 	if (QString(argv[i]) == "--fontFrameItalic") {
-		QString h=QString(argv[i+1]);
-		if (h == "true") fontFrameItalic=true;
+		if (QString(argv[i+1]) == "true") fontFrameItalic=true;
 		else fontFrameItalic=false;
 		}
-	if (QString(argv[i]) == "--fontHeaderWeight") QString fontHeaderWeightS=QString(argv[i+1]);
 	if (QString(argv[i]) == "--fontHeaderItalic") {
-		QString h=QString(argv[i+1]);
-		if (h == "true") fontHeaderItalic=true;
+		if (QString(argv[i+1]) == "true") fontHeaderItalic=true;
 		else fontHeaderItalic=false;
 		}
-	if (QString(argv[i]) == "--aspect") aspect=QString(argv[i+1]).toDouble();
-	if (QString(argv[i]) == "--stampPos")	stampPos=QString(argv[i+1]);
-	if (QString(argv[i]) == "--frameBoxColor") frameBoxColor=QString(argv[i+1]);
-	if (QString(argv[i]) == "--frameBox") frameBox=QString(argv[i+1]).toInt();
-	if (QString(argv[i]) == "--stampDescrPos")	stampDescrPos=QString(argv[i+1]);
-	if (QString(argv[i]) == "--stampDescr")	stampDescr=QString(argv[i+1]);
 	}
 
+	if (presetsList){
+		qDebug()<<"Presets in "<<cfg.fileName()<<":";
+		QStringList presets = cfg.childGroups();
+		foreach (QString preset, presets) qDebug()<<preset;
+		return 0;
+		}
+		
+	if (! presetInfo.isEmpty()){
+		qDebug()<<"Values in preset"<<presetInfo<<"in file"<<cfg.fileName()<<":";
+		cfg.beginGroup(presetInfo);
+		QStringList preset = cfg.childKeys();
+		foreach (QString key, preset){
+			QString str = key+" = "+ cfg.value(key,"").toString();
+			qDebug()<<str;
+			}
+		cfg.endGroup();
+		return 0;
+		}
+
 	if (argc < 2){
 		qDebug()<<"screengen videoFile [parameters]";
 		qDebug()<<"Parameters:";
 		qDebug()<<"   --preset                  Use section in config file (default - \"Default\")";
+		qDebug()<<"   --presetsList             Show all presets in config file (all other parameters ignored)";
+		qDebug()<<"   --presetInfo              Show all values in preset (all other parameters ignored, example: --presetInfo MyPreset";
 		qDebug()<<"   --frames                  Frames count in screenlist (default - 16)";
 		qDebug()<<"   --width                   Width screenlist (default - 1200)";
 		qDebug()<<"   --horCount                Frames in horisontal (default - 4)";

screengen-1.5-20120919.tar.bz2/src/qffmpeg.cpp -> screengen-1.6-20121122.tar.bz2/src/qffmpeg.cpp Changed

@@ -40,9 +40,11 @@
 			break;
 			}
 	if (aStreamNumber == -1) qDebug()<<"Not audio stream in"<<videoFile;
-	aCodecContext = pAVFormatContext->streams[aStreamNumber]->codec;
-	aCodec = avcodec_find_decoder (aCodecContext->codec_id);
-	if (avcodec_open2 (aCodecContext, aCodec, NULL)) qDebug()<<"Not open audio codec in"<<videoFile;
+	else{
+		aCodecContext = pAVFormatContext->streams[aStreamNumber]->codec;
+		aCodec = avcodec_find_decoder (aCodecContext->codec_id);
+		if (avcodec_open2 (aCodecContext, aCodec, NULL)) qDebug()<<"Not open audio codec in"<<videoFile;
+		}
 
 	if (vCodecContext->codec_tag > 0){
 		char vCodecTagC[32];
@@ -51,11 +53,13 @@
 		}
 
 	char aChC[32];
-	av_get_channel_layout_string (aChC, sizeof(aChC), aCodecContext->channels, aCodecContext->channel_layout);
-	aChannels = QString (aChC);
-	aSamples = QString::number ((double)aCodecContext->sample_rate / 1000);
-	aBitrate = QString::number (get_bit_rate (aCodecContext)/1000);
-	aCodecName = QString(aCodec->name).toUpper();
+	if (aStreamNumber != -1){
+		av_get_channel_layout_string (aChC, sizeof(aChC), aCodecContext->channels, aCodecContext->channel_layout);
+		aChannels = QString (aChC);
+		aSamples = QString::number ((double)aCodecContext->sample_rate / 1000);
+		aBitrate = QString::number (get_bit_rate (aCodecContext)/1000);
+		aCodecName = QString(aCodec->name).toUpper();
+		}
 	}
 
 // Вычисляет битрейт потока (пока только для звука, и то, не всегда)
@@ -90,9 +94,14 @@
 
 // Получение строки с информацией об аудио потоке
 QString TFfmpeg::getAInfo(){
-	QString br = "";
-	if (aBitrate != "0") br = ", " + aBitrate + " " + QObject::tr("kb/s");
-	return aCodecName + ", " + aChannels.toUpper() + ", " + aSamples + " " + QObject::tr("kHz") + br;
+	QString ret="";
+	if (aStreamNumber != -1){
+		QString br = "";
+		if (aBitrate != "0") br = ", " + aBitrate + " " + QObject::tr("kb/s");
+		ret = aCodecName + ", " + aChannels.toUpper() + ", " + aSamples + " " + QObject::tr("kHz") + br;
+		}
+	else ret = QObject::tr("Not present");
+	return ret;
 	}
 
 // Закрытие видеофайла

Changes of Revision 2