recordmydesktop-svn-commit Mailing List for recordMyDesktop
Status: Alpha
Brought to you by:
enselic
Menu
▾
▴
recordmydesktop-svn-commit — svn commits
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(39) |
Oct
(6) |
Nov
(16) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(14) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: svn c. f. r. <rec...@li...> - 2010-01-30 10:02:46
|
Revision: 602
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=602&view=rev
Author: enselic
Date: 2010-01-30 10:02:37 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
Update german translations, patch by Daniel Schemala
Modified Paths:
--------------
trunk/gtk-recordmydesktop/po/de.po
trunk/qt-recordmydesktop/po/de.po
Modified: trunk/gtk-recordmydesktop/po/de.po
===================================================================
--- trunk/gtk-recordmydesktop/po/de.po 2009-11-08 18:32:44 UTC (rev 601)
+++ trunk/gtk-recordmydesktop/po/de.po 2010-01-30 10:02:37 UTC (rev 602)
@@ -1,24 +1,25 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2006 Daniel Ziegenberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <dan...@gm...>, 2006.
-#
-#, fuzzy
+# Copyright (C) 2006 Daniel Ziegenberg
+# This file is distributed under the same license as the PACKAGE package.
+#
+# FIRST AUTHOR <dan...@gm...>, 2006.
+# Daniel Schemala <28...@we...>, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-08-15 01:56+0300\n"
-"PO-Revision-Date: 2006-12-04 17:35+0100\n"
-"Last-Translator: Daniel Ziegenberg <dan...@gm...>\n"
-"Language-Team: German <LL...@li...>\n"
+"PO-Revision-Date: 2010-01-19 16:29+0100\n"
+"Last-Translator: Daniel Schemala <28...@we...>\n"
+"Language-Team: qt-recordmydesktop-0.3.8 <kde...@kd...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: src/rmdStrings.py:10
msgid "Show/hide Main Window"
-msgstr ""
+msgstr "Hauptfenster zeigen/verstecken"
#: src/rmdStrings.py:11
msgid "_Select Area On Screen"
@@ -26,7 +27,7 @@
#: src/rmdStrings.py:12 src/rmdStrings.py:60
msgid "Quit"
-msgstr ""
+msgstr "Beenden"
#: src/rmdStrings.py:13
msgid "a graphical frontend for recordMyDesktop"
@@ -44,13 +45,15 @@
#: src/rmdStrings.py:15
msgid "Translator Credits And Information(Replace with your info)"
msgstr ""
-"Daniel ZiegenbergFür Fragen und Beschwerden bitte an daniel.ziegenberg@gmx."
+"Ursprüngliche Übersetzung von Daniel ZiegenbergFür Fragen und Beschwerden "
+"bitte an daniel.ziegenberg@gmx."
"net\n"
"Der Gebrauch der Deutschen oder Englischen Sprache\n"
"wäre ein Vorteil für eine schnellst mögliche Antwort.\n"
"Wenn eventuelle Übersetzungsungereimtheiten auftreten, bin ich für etwaige "
"Verbesserungsvorschläge immer zu offen.\n"
-"Wünsche eine angenehme und hilfreiche Verwendung dieser Freien Software."
+"Wünsche eine angenehme und hilfreiche Verwendung dieser Freien Software. "
+"Massive Verbesserungen von Daniel Schemala, 28...@we..."
#: src/rmdStrings.py:19
msgid "Success"
@@ -58,27 +61,27 @@
#: src/rmdStrings.py:20
msgid "Error while parsing the arguments."
-msgstr "Fehler während dem Lesen der Argumente."
+msgstr "Fehler beim Lesen der Argumente."
#: src/rmdStrings.py:21
msgid "Initializing the encoder failed(either vorbis or theora)"
-msgstr "Fehler während der Intialisierung des Encoders."
+msgstr "Fehler beim Intialisieren des Encoders."
#: src/rmdStrings.py:22
msgid "Could not open/configure sound card."
-msgstr "Fehler während des Öffnens/Konfigurieren der Soundkarte."
+msgstr "Fehler beim Öffnen/Konfigurieren der Soundkarte."
#: src/rmdStrings.py:23
msgid "Xdamage extension not present."
-msgstr "Xdamage Erweiterung nicht Erreichbar."
+msgstr "Xdamage-Erweiterung nicht erreichbar."
#: src/rmdStrings.py:24
msgid "Shared memory extension not present."
-msgstr "Shared memory Erweiterung nicht Erreichbar."
+msgstr "Shared-memory-Erweiterung nicht erreichbar."
#: src/rmdStrings.py:25
msgid "Xfixes extension not present."
-msgstr "Xfixes Erweiterung nicht Erreichbar."
+msgstr "Xfixes-Erweiterung nicht erreichbar."
#: src/rmdStrings.py:26
msgid "XInitThreads failed."
@@ -87,15 +90,15 @@
#: src/rmdStrings.py:27
msgid "No $DISPLAY environment variable and none specified as argument."
msgstr ""
-"Keine §DISPLAY Umgebungsvariable gefunden und keine als Argument angegeben."
+"Keine §DISPLAY-Umgebungsvariable gefunden und keine als Argument angegeben."
#: src/rmdStrings.py:28
msgid "Cannot connect to Xserver."
-msgstr "Verbindung zum Xserver schlug fehl"
+msgstr "Verbindung zum X-Server schlug fehl."
#: src/rmdStrings.py:29
msgid "Color depth is not 24bpp."
-msgstr "Die Farbtiefe beträgt nicht 24bpp"
+msgstr "Die Farbtiefe beträgt nicht 24 bpp."
#: src/rmdStrings.py:30
msgid "Improper window specification."
@@ -103,7 +106,7 @@
#: src/rmdStrings.py:31
msgid "Cannot attach shared memory to proccess."
-msgstr "Shared memory Erweiterung konnte nicht gestartet werden."
+msgstr "Shared-memory-Erweiterung konnte nicht gestartet werden."
#: src/rmdStrings.py:32
msgid "Cannot open file for writting."
@@ -112,22 +115,23 @@
#: src/rmdStrings.py:33
msgid "Cannot load the Jack library (dlopen/dlsym error on libjack.so)."
msgstr ""
+"Kann die Jack-Bibliothek nicht laden (dlopen/dlsvm-Fehler in libjack.so)"
#: src/rmdStrings.py:34
msgid "Cannot create new client."
-msgstr ""
+msgstr "Kann keinen neuen Client erstellen."
#: src/rmdStrings.py:35
msgid "Cannot activate client."
-msgstr ""
+msgstr "Kann Client nicht aktivieren."
#: src/rmdStrings.py:36
msgid "Port registration/connection failure."
-msgstr ""
+msgstr "Port-Registrier/Verbindungs-Fehler"
#: src/rmdStrings.py:37
msgid "Segmentation Fault"
-msgstr "Fehler in der Segmenatation."
+msgstr "Segmentierungsfehler"
#: src/rmdStrings.py:40
msgid ""
@@ -135,7 +139,7 @@
"recordMyDesktop has exited with status"
msgstr ""
"Aufnahme wurde beendet.\n"
-"recordMyDesktop wurde beendet unter Status"
+"recordMyDesktop wurde beendet im Status"
#: src/rmdStrings.py:41
msgid "Description"
@@ -148,29 +152,29 @@
"error code"
msgstr ""
"Aufnahme wurde beendet.\n"
-"recordMyDesktop wurde beendet und unbekanntem\n"
+"recordMyDesktop wurde beendet mit unbekanntem\n"
"Fehlercode"
#: src/rmdStrings.py:46 src/rmdStrings.py:76
msgid "Video Quality"
-msgstr "Video Qualität"
+msgstr "Video-Qualität"
#: src/rmdStrings.py:46 src/rmdStrings.py:76
msgid "Sound Quality"
-msgstr "Audio Qualität"
+msgstr "Audio-Qualität"
#: src/rmdStrings.py:47
msgid "Advanced"
-msgstr "Erweitert"
+msgstr "Erweitert..."
#: src/rmdStrings.py:47
msgid "Select Window"
-msgstr "Wählen Sie bitte ein Fenster aus"
+msgstr "Fenster auswählen"
#: src/rmdStrings.py:48
msgid "Click here to select a window to record"
msgstr ""
-"Bitte hier klicken, um ein Fenster auszuwählen, dessen Inhalt aufgenommen "
+"Hier klicken, um ein Fenster auszuwählen, dessen Inhalt aufgenommen "
"werden soll."
#: src/rmdStrings.py:49
@@ -178,8 +182,8 @@
"Click to start the recording.\n"
"This window will hide itself."
msgstr ""
-"Bitte hier klicken um die Aufnahme zu starten.\n"
-"Das Fenster wird während der Aufnahme unsichtbar"
+"Hier klicken, um die Aufnahme zu starten.\n"
+"Das Fenster wird während der Aufnahme unsichtbar."
#: src/rmdStrings.py:50
msgid ""
@@ -189,15 +193,15 @@
"will have a number attached on its name\n"
"(this behavior can be changed )"
msgstr ""
-"Bitte klicken Sie hier um den Dateinamen und Dateipfad auszuwählen.\n"
-"Standartmässig ist out.ogv in Ihrem Home-Verzeichnis ausgewähl.\n"
+"Hier klicken, um den Dateinamen und Dateipfad auszuwählen.\n"
+"Standardmäßig ist out.ogv in Ihrem Home-Verzeichnis ausgewählt.\n"
"Wenn der ausgewählte Dateiname schon besteht, wird eine fortlaufende Nummer "
-"angehäng. \n"
-"(diese Standardoption kann geändert werden)"
+"angehängt.\n"
+"(Dieses Verhalten kann geändert werden.)"
#: src/rmdStrings.py:51
msgid "Click to exit the program."
-msgstr "Hier klicken um das Programm zu beenden."
+msgstr "Hier klicken, um das Programm zu beenden."
#: src/rmdStrings.py:52
msgid ""
@@ -206,22 +210,22 @@
"so it's recommended, when encoding on the fly,\n"
"to leave at 100)"
msgstr ""
-"Bitte die Videoqualität der Aufnahme auswählen.\n"
-"(Eine niedrigere Qulität bedeutet mehr freie Rechnerleistung\n"
-"daher wird empfohlen die Einstellung >Während der Aufnahme encodieren<,\n"
-"bei 100 zu belassen.)"
+"Hier die Videoqualität der Aufnahme auswählen.\n"
+"(Eine niedrigere Qualität benötigt mehr Rechnerleistung,\n"
+"daher wird empfohlen, diese Einstellung bei 100 zu belassen,\n"
+"wenn „Während der Aufnahme encodieren“ ausgewählt ist.)"
#: src/rmdStrings.py:53
msgid "Enable/Disable sound recording."
-msgstr "Audio Aufnahme aktivieren/deaktivieren"
+msgstr "Audioaufnahme aktivieren/deaktivieren"
#: src/rmdStrings.py:54
msgid "Select the audio quality of your recording."
-msgstr "Wählen Sie bitte die Audioqualität der Aufnahme aus."
+msgstr "Audioqualität der Aufnahme auswählen"
#: src/rmdStrings.py:55
msgid "Click here to access more options."
-msgstr "Bitte hier klicken um weitere Optionen ein zu stellen zu können."
+msgstr "Hier klicken für weitere Optionen"
#: src/rmdStrings.py:56
msgid ""
@@ -231,21 +235,21 @@
"Right click on it, to reset the area."
msgstr ""
"\n"
-"Bitte im gerade angezeigten Fenster links klicken und ziehen,\n"
-"um einen Bereich zum Aufnehmen auszuwählen.\n"
-"Rechts klicken um den ausgwählten Bereich zurückzusetzen"
+"Im Vorschaufenster links klicken und ziehen, um den\n"
+"Aufnahmebereich festzulegen.\n"
+"Rechtsklicken, um den Bereich zurückzusetzen."
#: src/rmdStrings.py:58
msgid "Record"
-msgstr ""
+msgstr "Aufnahme"
#: src/rmdStrings.py:59
msgid "Save As"
-msgstr ""
+msgstr "Speichern unter..."
#: src/rmdStrings.py:63
msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
#: src/rmdStrings.py:64
msgid ""
@@ -254,10 +258,10 @@
"If you press Cancel or close this window,\n"
"this proccess cannot be resumed!"
msgstr ""
-"Bitte warten während Ihre Aufnahme encodiert wird.\n"
-"Achtung!!!\n"
-"Wenn sie >Beenden< drücken oder dieses Fenster schliessen,\n"
-"kann der Prozess nicht wieder hergestellt werden!"
+"Bitte warten, während Ihre Aufnahme encodiert wird.\n"
+"Achtung!\n"
+"Wenn sie „Abbrechen“ drücken oder dieses Fenster schließen,\n"
+"kann dieser Prozess nicht wieder aufgenommen werden!"
#: src/rmdStrings.py:65
msgid "complete"
@@ -269,7 +273,7 @@
#: src/rmdStrings.py:68
msgid "Working Directory"
-msgstr "Arbeits-Dateipfad"
+msgstr "Arbeitsfad"
#: src/rmdStrings.py:69 src/rmdStrings.py:83
msgid "Frames Per Second"
@@ -277,15 +281,15 @@
#: src/rmdStrings.py:69
msgid "Encode On the Fly"
-msgstr "Während der Aufnahme encodieren"
+msgstr "Während der Aufnahme kodieren"
#: src/rmdStrings.py:69
msgid "Zero Compression"
-msgstr "Zero Kompression"
+msgstr "Zero Compression"
#: src/rmdStrings.py:70
msgid "Quick Subsampling"
-msgstr "schnelles Subsampling"
+msgstr "Schnelles Subsampling"
#: src/rmdStrings.py:70
msgid "Full shots at every frame"
@@ -313,39 +317,39 @@
#: src/rmdStrings.py:72
msgid "Follow Mouse"
-msgstr ""
+msgstr "Der Maus folgen"
#: src/rmdStrings.py:72
msgid "MIT-Shm extension"
-msgstr "MIT-Shm Erweiterung"
+msgstr "MIT-Shm-Erweiterung"
#: src/rmdStrings.py:72
msgid "Include Window Decorations"
-msgstr ""
+msgstr "Fensterdekoration einbeziehen"
#: src/rmdStrings.py:73
msgid "Tooltips"
-msgstr ""
+msgstr "Tooltips"
#: src/rmdStrings.py:73
msgid "Outline Capture Area On Screen"
-msgstr ""
+msgstr "Aufnahmebereich auf dem Bildschirm anzeigen"
#: src/rmdStrings.py:74
msgid "Reset Capture Area"
-msgstr ""
+msgstr "Aufnahmebereich zurücksetzen"
#: src/rmdStrings.py:75
msgid "Extra Options"
-msgstr ""
+msgstr "Weitere Optionen"
#: src/rmdStrings.py:77
msgid "Drop Frames(encoder)"
-msgstr "Ausgelassene Frames(encoder)"
+msgstr ""
#: src/rmdStrings.py:77
msgid "Startup Delay(secs)"
-msgstr "Pause am Beginn(secs)"
+msgstr "Pause am Beginn (in sec)"
#: src/rmdStrings.py:78
msgid "Normal"
@@ -353,7 +357,7 @@
#: src/rmdStrings.py:78
msgid "White"
-msgstr "Weiss"
+msgstr "Weiß"
#: src/rmdStrings.py:78
msgid "Black"
@@ -361,7 +365,7 @@
#: src/rmdStrings.py:78
msgid "None"
-msgstr "Nichts"
+msgstr "Keiner"
#: src/rmdStrings.py:79
msgid "Enabled"
@@ -373,7 +377,7 @@
#: src/rmdStrings.py:80
msgid "Files"
-msgstr "Datei(en)"
+msgstr "Dateien"
#: src/rmdStrings.py:80
msgid "Performance"
@@ -385,7 +389,7 @@
#: src/rmdStrings.py:80
msgid "Misc"
-msgstr "Misc"
+msgstr "Sonstiges"
#: src/rmdStrings.py:81
msgid ""
@@ -396,13 +400,13 @@
"By checking this box, this behavior is disabled and the old file is "
"overwritten.\n"
msgstr ""
-"Wenn Sie versuchen unter einem schon bestehenden Dateinamen zu speichern,\n"
-"wird die Datein automatisch umbenannt.\n"
-"(Zum Beispiel: Die Datei out.ogv, die bereits besteht,\n"
-"wird auf out.ogv.1 umbenannt.)\n"
-"Durch das aktivieren dieser Checkbox, wird oben genanntes Verhalten "
-"geändert\n"
-"und die bereits vorhandene Datei überschrieben.\n"
+"<qt>Wenn Sie versuchen, unter einem schon bestehenden Dateinamen zu "
+"speichern, "
+"wird die Datein automatisch umbenannt. "
+"(Zum Beispiel wird die Datei out.ogv, wenn eine andere bereits besteht, "
+"nach out-1.ogv umbenannt.) "
+"Durch das Aktivieren dieses Kastens wird oben genanntes Verhalten geändert "
+"und die bereits vorhandene Datei überschrieben.</qt>\n"
#: src/rmdStrings.py:82
msgid "Directory where temporary files will be saved."
@@ -413,7 +417,7 @@
"Encode simultaneously with the recording.\n"
"This will require a lot more processing power.\n"
msgstr ""
-"Während der Aufnahme encodieren.\n"
+"Während der Aufnahme kodieren.\n"
"Diese Einstellung wird wesentlich mehr Rechnerleistung benötigen.\n"
#: src/rmdStrings.py:85
@@ -423,32 +427,32 @@
"in the expense of hard disk space.\n"
"This option is valid only when encoding on the fly is disabled."
msgstr ""
-"Komprimierung nicht auf temporäre Dateien anwenden.\n"
+"<qt>Komprimierung nicht auf temporäre Dateien anwenden. "
"Wenn diese Funktion ausgewählt wurde, braucht der Computer weniger "
-"Rechnerleistung,\n"
-"im Ausgleich dazu aber mehr Speicherplatz.\n"
-"Diese Option ist nur verfügbar, wenn das >Encodieren während der Aufnahme< "
-"deaktiviert wurde."
+"Rechnerleistung, "
+"im Ausgleich dazu aber mehr Speicherplatz. "
+"Diese Option ist nur zulässig, wenn „Während der Aufnahme kodieren“ "
+"deaktiviert ist.</qt>"
#: src/rmdStrings.py:86
msgid ""
"This option, if enabled, will cause the program to require less\n"
"processing power, but it might make the colors look a bit more blurry."
msgstr ""
-"Diese Einstellung (wenn aktiv) benötigt weniger Rechnerleistung,\n"
-"aber es können unter Umständen leicht fleckige Farben entstehen."
+"Ist diese Option aktiviert, benötigt das Programm weniger Rechnerleistung,\n"
+"aber die Farben könnten dadurch etwas verschwommener wirken."
#: src/rmdStrings.py:87
-#, fuzzy
msgid ""
"This option should be enabled when recording 3d windows.\n"
"It is also auto-enabled when recording a\n"
"known 3d compositing window manager.\n"
" "
msgstr ""
-"Diese Option sollte aktiviert sein, wenn 3D Fenster aufgenommen werden.\n"
+"Diese Option sollte aktiviert sein, wenn 3D-Fenster aufgenommen werden.\n"
"Sie ist auch automatisch aktiviert,\n"
-"wenn mit bekannten 3D Fenster Manager aufgenommen wird.\n"
+"wenn mit bekanntem 3D-Fenstermanager aufgenommen wird.\n"
+" "
#: src/rmdStrings.py:88
msgid "Number of audio channels."
@@ -460,11 +464,11 @@
#: src/rmdStrings.py:90
msgid "ALSA sound device, that is used for sound recording."
-msgstr "ALSA audio Gerät, das zur Audioaufnahme verwendet wird."
+msgstr "ALSA-Audiogerät, das zur Audioaufnahme verwendet wird"
#: src/rmdStrings.py:91
msgid "Connection to the Xserver."
-msgstr "Verbindung zum Xserver."
+msgstr "Verbindung zum X-Server"
#: src/rmdStrings.py:92
msgid ""
@@ -474,10 +478,9 @@
"You can also disable cursor drawing."
msgstr ""
"Mauszeiger, der angezeigt wird.\n"
-"Mit >Normal< ist der Systemmauszeiger gemeint,der während der Aufnahme "
-"angezeigt wird,\n"
-"wo hingegen >Schwarz< und >Weiß< Mauszeiger sind, die vom Programm angezeigt "
-"werden."
+"„Normal“ ist der Systemmauszeiger; „Schwarz“ und „Weiß“ sind Mauszeiger,\n"
+"die vom Programm angezeigt werden.\n"
+"„Keiner“ zeichnet keinen Mauszeiger."
#: src/rmdStrings.py:93
msgid ""
@@ -487,6 +490,9 @@
"every frame, so it's not recommended\n"
"for large capture areas."
msgstr ""
+"Ist diese Option aktiviert, folgt der Aufnahmebereich dem Mauszeiger.\n"
+"Diese Option aktiviert auch die Vollbildaufnahme in jedem Bild,\n"
+"daher wird es nicht empfohlen für große Aufnahmebereiche."
#: src/rmdStrings.py:94
msgid ""
@@ -495,23 +501,26 @@
"Disabling this option is not recommended,\n"
"as it may severely slow down the program."
msgstr ""
-"Vernwenden Sie, entsprechend der anderen Programm Einstellungen, immer wenn "
-"möglich,\n"
-"die MIT-Shared memory Erweiterung.\n"
-"Diese Option zu deaktivieren ist nicht empfehlenswert\n"
-"da starke Leistungeinbusen des Programms die Folge sind."
+"Es wird, wenn möglich, entsprechend der anderen Programmeinstellungen,\n"
+"die MIT-Shared-memory-Erweiterung benutzt.\n"
+"Diese Option zu deaktivieren ist nicht empfehlenswert,\n"
+"da starke Leistungeinbußen des Programms die Folge sind."
#: src/rmdStrings.py:95
msgid ""
"When selecting a window via the \"Select Window\" button,\n"
"include that window's decorations in the recording area."
msgstr ""
+"Die Fensterdekoration in den Aufnahmebereich einbeziehen, wenn das Fenster "
+"über „Fenster auswählen“ ausgewählt wird."
#: src/rmdStrings.py:96
msgid ""
"Enable or disable tooltips, like this one.\n"
"(Requires restart)"
msgstr ""
+"Tooltips (wie diesen hier) ein- oder ausschalten. Benötigt einen Neustart "
+"des Programms."
#: src/rmdStrings.py:97
msgid ""
@@ -519,12 +528,15 @@
"that will get captured.\n"
"(This frame will remain throughout the recording.)"
msgstr ""
+"Einen Rahmen um den Aufnahmebereich auf den Bildschirm zeichen.\n"
+"(Dieser Rahmen bleibt auch während der Aufnahme.)"
#: src/rmdStrings.py:98
msgid ""
"Reset capture area after every recording\n"
"and at program shutdown."
msgstr ""
+"Aufnahmebereich nach der Aufnahme und dem Beenden des Programms zurücksetzen."
#: src/rmdStrings.py:99
msgid ""
@@ -534,6 +546,11 @@
"they would in the commandline (i.e. separated with spaces).\n"
"Consult the manpage for more information on using them."
msgstr ""
+"<qt>Weitere Kommandozeilenparameter, die recordMyDesktop "
+"bei der Initialisierung übergeben werden. "
+"Diese Parameter müssen im selben Format angegeben werden wie "
+"auf der Konsole (z.B. durch Leerzeichen getrennt). "
+"Für Informationen über die Parameter, siehe Manpage.</qt>"
#: src/rmdStrings.py:100
msgid ""
@@ -545,40 +562,47 @@
"recordMyDesktop must be compiled with JACK\n"
"support for this option to work."
msgstr ""
+"<qt>Diese Option aktivieren, um JACK für die Audioaufnahme zu benutzen. "
+"Der JACK-Server muss laufen, um die Ports zu finden, die aufgenommen werden. "
+"Die Aufnahme aus jedem Port wird in einen separaten Kanal geschrieben. "
+"Damit diese Option funktioniert, muss recordMyDesktop "
+"mit JACK-Unterstützung kompiliert worden sein.</qt>"
#: src/rmdStrings.py:102
msgid "Use Jack for audio capture."
-msgstr ""
+msgstr "JACK für Audioaufnahme benutzen"
#: src/rmdStrings.py:103
msgid ""
"Select the ports you want to record from\n"
"(hold Ctrl to select multiple entries):"
msgstr ""
+"Wählen Sie die Ports, von denen aufgenommen werden soll.\n"
+"Drücken sie Strg, um mehrere Einträge zu wählen."
#: src/rmdStrings.py:105
msgid "Available Ports"
-msgstr ""
+msgstr "Verfügbare Ports"
#: src/rmdStrings.py:106
msgid "jack_lsp returned no ports."
-msgstr ""
+msgstr "jack_lsp zeigt keine Ports an"
#: src/rmdStrings.py:107
msgid "Make sure that jackd is running."
-msgstr ""
+msgstr "Stellen Sie sicher, dass jackd läuft."
#: src/rmdStrings.py:108
msgid "Available ports (double click to add):"
-msgstr ""
+msgstr "Verfügbare Ports (doppelklicken zum Hinzufügen):"
#: src/rmdStrings.py:109
msgid "Selected ports (double click to remove):"
-msgstr ""
+msgstr "Ausgewählte Ports (doppelklicken zum Entfernen):"
#: src/rmdStrings.py:110
msgid "Refresh"
-msgstr ""
+msgstr "Aktualisieren"
#~ msgid "gtk-recordMyDesktop"
#~ msgstr "gtk-recordMyDesktop"
Modified: trunk/qt-recordmydesktop/po/de.po
===================================================================
--- trunk/qt-recordmydesktop/po/de.po 2009-11-08 18:32:44 UTC (rev 601)
+++ trunk/qt-recordmydesktop/po/de.po 2010-01-30 10:02:37 UTC (rev 602)
@@ -1,24 +1,25 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2006 Daniel Ziegenberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <dan...@gm...>, 2006.
-#
-#, fuzzy
+# Copyright (C) 2006 Daniel Ziegenberg
+# This file is distributed under the same license as the PACKAGE package.
+#
+# FIRST AUTHOR <dan...@gm...>, 2006.
+# Daniel Schemala <28...@we...>, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-08-15 01:56+0300\n"
-"PO-Revision-Date: 2006-12-04 17:35+0100\n"
-"Last-Translator: Daniel Ziegenberg <dan...@gm...>\n"
-"Language-Team: German <LL...@li...>\n"
+"PO-Revision-Date: 2010-01-19 16:29+0100\n"
+"Last-Translator: Daniel Schemala <28...@we...>\n"
+"Language-Team: qt-recordmydesktop-0.3.8 <kde...@kd...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: src/rmdStrings.py:10
msgid "Show/hide Main Window"
-msgstr ""
+msgstr "Hauptfenster zeigen/verstecken"
#: src/rmdStrings.py:11
msgid "_Select Area On Screen"
@@ -26,7 +27,7 @@
#: src/rmdStrings.py:12 src/rmdStrings.py:60
msgid "Quit"
-msgstr ""
+msgstr "Beenden"
#: src/rmdStrings.py:13
msgid "a graphical frontend for recordMyDesktop"
@@ -44,13 +45,15 @@
#: src/rmdStrings.py:15
msgid "Translator Credits And Information(Replace with your info)"
msgstr ""
-"Daniel ZiegenbergFür Fragen und Beschwerden bitte an daniel.ziegenberg@gmx."
+"Ursprüngliche Übersetzung von Daniel ZiegenbergFür Fragen und Beschwerden "
+"bitte an daniel.ziegenberg@gmx."
"net\n"
"Der Gebrauch der Deutschen oder Englischen Sprache\n"
"wäre ein Vorteil für eine schnellst mögliche Antwort.\n"
"Wenn eventuelle Übersetzungsungereimtheiten auftreten, bin ich für etwaige "
"Verbesserungsvorschläge immer zu offen.\n"
-"Wünsche eine angenehme und hilfreiche Verwendung dieser Freien Software."
+"Wünsche eine angenehme und hilfreiche Verwendung dieser Freien Software. "
+"Massive Verbesserungen von Daniel Schemala, 28...@we..."
#: src/rmdStrings.py:19
msgid "Success"
@@ -58,27 +61,27 @@
#: src/rmdStrings.py:20
msgid "Error while parsing the arguments."
-msgstr "Fehler während dem Lesen der Argumente."
+msgstr "Fehler beim Lesen der Argumente."
#: src/rmdStrings.py:21
msgid "Initializing the encoder failed(either vorbis or theora)"
-msgstr "Fehler während der Intialisierung des Encoders."
+msgstr "Fehler beim Intialisieren des Encoders."
#: src/rmdStrings.py:22
msgid "Could not open/configure sound card."
-msgstr "Fehler während des Öffnens/Konfigurieren der Soundkarte."
+msgstr "Fehler beim Öffnen/Konfigurieren der Soundkarte."
#: src/rmdStrings.py:23
msgid "Xdamage extension not present."
-msgstr "Xdamage Erweiterung nicht Erreichbar."
+msgstr "Xdamage-Erweiterung nicht erreichbar."
#: src/rmdStrings.py:24
msgid "Shared memory extension not present."
-msgstr "Shared memory Erweiterung nicht Erreichbar."
+msgstr "Shared-memory-Erweiterung nicht erreichbar."
#: src/rmdStrings.py:25
msgid "Xfixes extension not present."
-msgstr "Xfixes Erweiterung nicht Erreichbar."
+msgstr "Xfixes-Erweiterung nicht erreichbar."
#: src/rmdStrings.py:26
msgid "XInitThreads failed."
@@ -87,15 +90,15 @@
#: src/rmdStrings.py:27
msgid "No $DISPLAY environment variable and none specified as argument."
msgstr ""
-"Keine §DISPLAY Umgebungsvariable gefunden und keine als Argument angegeben."
+"Keine §DISPLAY-Umgebungsvariable gefunden und keine als Argument angegeben."
#: src/rmdStrings.py:28
msgid "Cannot connect to Xserver."
-msgstr "Verbindung zum Xserver schlug fehl"
+msgstr "Verbindung zum X-Server schlug fehl."
#: src/rmdStrings.py:29
msgid "Color depth is not 24bpp."
-msgstr "Die Farbtiefe beträgt nicht 24bpp"
+msgstr "Die Farbtiefe beträgt nicht 24 bpp."
#: src/rmdStrings.py:30
msgid "Improper window specification."
@@ -103,7 +106,7 @@
#: src/rmdStrings.py:31
msgid "Cannot attach shared memory to proccess."
-msgstr "Shared memory Erweiterung konnte nicht gestartet werden."
+msgstr "Shared-memory-Erweiterung konnte nicht gestartet werden."
#: src/rmdStrings.py:32
msgid "Cannot open file for writting."
@@ -112,22 +115,23 @@
#: src/rmdStrings.py:33
msgid "Cannot load the Jack library (dlopen/dlsym error on libjack.so)."
msgstr ""
+"Kann die Jack-Bibliothek nicht laden (dlopen/dlsvm-Fehler in libjack.so)"
#: src/rmdStrings.py:34
msgid "Cannot create new client."
-msgstr ""
+msgstr "Kann keinen neuen Client erstellen."
#: src/rmdStrings.py:35
msgid "Cannot activate client."
-msgstr ""
+msgstr "Kann Client nicht aktivieren."
#: src/rmdStrings.py:36
msgid "Port registration/connection failure."
-msgstr ""
+msgstr "Port-Registrier/Verbindungs-Fehler"
#: src/rmdStrings.py:37
msgid "Segmentation Fault"
-msgstr "Fehler in der Segmenatation."
+msgstr "Segmentierungsfehler"
#: src/rmdStrings.py:40
msgid ""
@@ -135,7 +139,7 @@
"recordMyDesktop has exited with status"
msgstr ""
"Aufnahme wurde beendet.\n"
-"recordMyDesktop wurde beendet unter Status"
+"recordMyDesktop wurde beendet im Status"
#: src/rmdStrings.py:41
msgid "Description"
@@ -148,29 +152,29 @@
"error code"
msgstr ""
"Aufnahme wurde beendet.\n"
-"recordMyDesktop wurde beendet und unbekanntem\n"
+"recordMyDesktop wurde beendet mit unbekanntem\n"
"Fehlercode"
#: src/rmdStrings.py:46 src/rmdStrings.py:76
msgid "Video Quality"
-msgstr "Video Qualität"
+msgstr "Video-Qualität"
#: src/rmdStrings.py:46 src/rmdStrings.py:76
msgid "Sound Quality"
-msgstr "Audio Qualität"
+msgstr "Audio-Qualität"
#: src/rmdStrings.py:47
msgid "Advanced"
-msgstr "Erweitert"
+msgstr "Erweitert..."
#: src/rmdStrings.py:47
msgid "Select Window"
-msgstr "Wählen Sie bitte ein Fenster aus"
+msgstr "Fenster auswählen"
#: src/rmdStrings.py:48
msgid "Click here to select a window to record"
msgstr ""
-"Bitte hier klicken, um ein Fenster auszuwählen, dessen Inhalt aufgenommen "
+"Hier klicken, um ein Fenster auszuwählen, dessen Inhalt aufgenommen "
"werden soll."
#: src/rmdStrings.py:49
@@ -178,8 +182,8 @@
"Click to start the recording.\n"
"This window will hide itself."
msgstr ""
-"Bitte hier klicken um die Aufnahme zu starten.\n"
-"Das Fenster wird während der Aufnahme unsichtbar"
+"Hier klicken, um die Aufnahme zu starten.\n"
+"Das Fenster wird während der Aufnahme unsichtbar."
#: src/rmdStrings.py:50
msgid ""
@@ -189,15 +193,15 @@
"will have a number attached on its name\n"
"(this behavior can be changed )"
msgstr ""
-"Bitte klicken Sie hier um den Dateinamen und Dateipfad auszuwählen.\n"
-"Standartmässig ist out.ogv in Ihrem Home-Verzeichnis ausgewähl.\n"
+"Hier klicken, um den Dateinamen und Dateipfad auszuwählen.\n"
+"Standardmäßig ist out.ogv in Ihrem Home-Verzeichnis ausgewählt.\n"
"Wenn der ausgewählte Dateiname schon besteht, wird eine fortlaufende Nummer "
-"angehäng. \n"
-"(diese Standardoption kann geändert werden)"
+"angehängt.\n"
+"(Dieses Verhalten kann geändert werden.)"
#: src/rmdStrings.py:51
msgid "Click to exit the program."
-msgstr "Hier klicken um das Programm zu beenden."
+msgstr "Hier klicken, um das Programm zu beenden."
#: src/rmdStrings.py:52
msgid ""
@@ -206,22 +210,22 @@
"so it's recommended, when encoding on the fly,\n"
"to leave at 100)"
msgstr ""
-"Bitte die Videoqualität der Aufnahme auswählen.\n"
-"(Eine niedrigere Qulität bedeutet mehr freie Rechnerleistung\n"
-"daher wird empfohlen die Einstellung >Während der Aufnahme encodieren<,\n"
-"bei 100 zu belassen.)"
+"Hier die Videoqualität der Aufnahme auswählen.\n"
+"(Eine niedrigere Qualität benötigt mehr Rechnerleistung,\n"
+"daher wird empfohlen, diese Einstellung bei 100 zu belassen,\n"
+"wenn „Während der Aufnahme encodieren“ ausgewählt ist.)"
#: src/rmdStrings.py:53
msgid "Enable/Disable sound recording."
-msgstr "Audio Aufnahme aktivieren/deaktivieren"
+msgstr "Audioaufnahme aktivieren/deaktivieren"
#: src/rmdStrings.py:54
msgid "Select the audio quality of your recording."
-msgstr "Wählen Sie bitte die Audioqualität der Aufnahme aus."
+msgstr "Audioqualität der Aufnahme auswählen"
#: src/rmdStrings.py:55
msgid "Click here to access more options."
-msgstr "Bitte hier klicken um weitere Optionen ein zu stellen zu können."
+msgstr "Hier klicken für weitere Optionen"
#: src/rmdStrings.py:56
msgid ""
@@ -231,21 +235,21 @@
"Right click on it, to reset the area."
msgstr ""
"\n"
-"Bitte im gerade angezeigten Fenster links klicken und ziehen,\n"
-"um einen Bereich zum Aufnehmen auszuwählen.\n"
-"Rechts klicken um den ausgwählten Bereich zurückzusetzen"
+"Im Vorschaufenster links klicken und ziehen, um den\n"
+"Aufnahmebereich festzulegen.\n"
+"Rechtsklicken, um den Bereich zurückzusetzen."
#: src/rmdStrings.py:58
msgid "Record"
-msgstr ""
+msgstr "Aufnahme"
#: src/rmdStrings.py:59
msgid "Save As"
-msgstr ""
+msgstr "Speichern unter..."
#: src/rmdStrings.py:63
msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
#: src/rmdStrings.py:64
msgid ""
@@ -254,10 +258,10 @@
"If you press Cancel or close this window,\n"
"this proccess cannot be resumed!"
msgstr ""
-"Bitte warten während Ihre Aufnahme encodiert wird.\n"
-"Achtung!!!\n"
-"Wenn sie >Beenden< drücken oder dieses Fenster schliessen,\n"
-"kann der Prozess nicht wieder hergestellt werden!"
+"Bitte warten, während Ihre Aufnahme encodiert wird.\n"
+"Achtung!\n"
+"Wenn sie „Abbrechen“ drücken oder dieses Fenster schließen,\n"
+"kann dieser Prozess nicht wieder aufgenommen werden!"
#: src/rmdStrings.py:65
msgid "complete"
@@ -269,7 +273,7 @@
#: src/rmdStrings.py:68
msgid "Working Directory"
-msgstr "Arbeits-Dateipfad"
+msgstr "Arbeitsfad"
#: src/rmdStrings.py:69 src/rmdStrings.py:83
msgid "Frames Per Second"
@@ -277,15 +281,15 @@
#: src/rmdStrings.py:69
msgid "Encode On the Fly"
-msgstr "Während der Aufnahme encodieren"
+msgstr "Während der Aufnahme kodieren"
#: src/rmdStrings.py:69
msgid "Zero Compression"
-msgstr "Zero Kompression"
+msgstr "Zero Compression"
#: src/rmdStrings.py:70
msgid "Quick Subsampling"
-msgstr "schnelles Subsampling"
+msgstr "Schnelles Subsampling"
#: src/rmdStrings.py:70
msgid "Full shots at every frame"
@@ -313,39 +317,39 @@
#: src/rmdStrings.py:72
msgid "Follow Mouse"
-msgstr ""
+msgstr "Der Maus folgen"
#: src/rmdStrings.py:72
msgid "MIT-Shm extension"
-msgstr "MIT-Shm Erweiterung"
+msgstr "MIT-Shm-Erweiterung"
#: src/rmdStrings.py:72
msgid "Include Window Decorations"
-msgstr ""
+msgstr "Fensterdekoration einbeziehen"
#: src/rmdStrings.py:73
msgid "Tooltips"
-msgstr ""
+msgstr "Tooltips"
#: src/rmdStrings.py:73
msgid "Outline Capture Area On Screen"
-msgstr ""
+msgstr "Aufnahmebereich auf dem Bildschirm anzeigen"
#: src/rmdStrings.py:74
msgid "Reset Capture Area"
-msgstr ""
+msgstr "Aufnahmebereich zurücksetzen"
#: src/rmdStrings.py:75
msgid "Extra Options"
-msgstr ""
+msgstr "Weitere Optionen"
#: src/rmdStrings.py:77
msgid "Drop Frames(encoder)"
-msgstr "Ausgelassene Frames(encoder)"
+msgstr ""
#: src/rmdStrings.py:77
msgid "Startup Delay(secs)"
-msgstr "Pause am Beginn(secs)"
+msgstr "Pause am Beginn (in sec)"
#: src/rmdStrings.py:78
msgid "Normal"
@@ -353,7 +357,7 @@
#: src/rmdStrings.py:78
msgid "White"
-msgstr "Weiss"
+msgstr "Weiß"
#: src/rmdStrings.py:78
msgid "Black"
@@ -361,7 +365,7 @@
#: src/rmdStrings.py:78
msgid "None"
-msgstr "Nichts"
+msgstr "Keiner"
#: src/rmdStrings.py:79
msgid "Enabled"
@@ -373,7 +377,7 @@
#: src/rmdStrings.py:80
msgid "Files"
-msgstr "Datei(en)"
+msgstr "Dateien"
#: src/rmdStrings.py:80
msgid "Performance"
@@ -385,7 +389,7 @@
#: src/rmdStrings.py:80
msgid "Misc"
-msgstr "Misc"
+msgstr "Sonstiges"
#: src/rmdStrings.py:81
msgid ""
@@ -396,13 +400,13 @@
"By checking this box, this behavior is disabled and the old file is "
"overwritten.\n"
msgstr ""
-"Wenn Sie versuchen unter einem schon bestehenden Dateinamen zu speichern,\n"
-"wird die Datein automatisch umbenannt.\n"
-"(Zum Beispiel: Die Datei out.ogv, die bereits besteht,\n"
-"wird auf out.ogv.1 umbenannt.)\n"
-"Durch das aktivieren dieser Checkbox, wird oben genanntes Verhalten "
-"geändert\n"
-"und die bereits vorhandene Datei überschrieben.\n"
+"<qt>Wenn Sie versuchen, unter einem schon bestehenden Dateinamen zu "
+"speichern, "
+"wird die Datein automatisch umbenannt. "
+"(Zum Beispiel wird die Datei out.ogv, wenn eine andere bereits besteht, "
+"nach out-1.ogv umbenannt.) "
+"Durch das Aktivieren dieses Kastens wird oben genanntes Verhalten geändert "
+"und die bereits vorhandene Datei überschrieben.</qt>\n"
#: src/rmdStrings.py:82
msgid "Directory where temporary files will be saved."
@@ -413,7 +417,7 @@
"Encode simultaneously with the recording.\n"
"This will require a lot more processing power.\n"
msgstr ""
-"Während der Aufnahme encodieren.\n"
+"Während der Aufnahme kodieren.\n"
"Diese Einstellung wird wesentlich mehr Rechnerleistung benötigen.\n"
#: src/rmdStrings.py:85
@@ -423,32 +427,32 @@
"in the expense of hard disk space.\n"
"This option is valid only when encoding on the fly is disabled."
msgstr ""
-"Komprimierung nicht auf temporäre Dateien anwenden.\n"
+"<qt>Komprimierung nicht auf temporäre Dateien anwenden. "
"Wenn diese Funktion ausgewählt wurde, braucht der Computer weniger "
-"Rechnerleistung,\n"
-"im Ausgleich dazu aber mehr Speicherplatz.\n"
-"Diese Option ist nur verfügbar, wenn das >Encodieren während der Aufnahme< "
-"deaktiviert wurde."
+"Rechnerleistung, "
+"im Ausgleich dazu aber mehr Speicherplatz. "
+"Diese Option ist nur zulässig, wenn „Während der Aufnahme kodieren“ "
+"deaktiviert ist.</qt>"
#: src/rmdStrings.py:86
msgid ""
"This option, if enabled, will cause the program to require less\n"
"processing power, but it might make the colors look a bit more blurry."
msgstr ""
-"Diese Einstellung (wenn aktiv) benötigt weniger Rechnerleistung,\n"
-"aber es können unter Umständen leicht fleckige Farben entstehen."
+"Ist diese Option aktiviert, benötigt das Programm weniger Rechnerleistung,\n"
+"aber die Farben könnten dadurch etwas verschwommener wirken."
#: src/rmdStrings.py:87
-#, fuzzy
msgid ""
"This option should be enabled when recording 3d windows.\n"
"It is also auto-enabled when recording a\n"
"known 3d compositing window manager.\n"
" "
msgstr ""
-"Diese Option sollte aktiviert sein, wenn 3D Fenster aufgenommen werden.\n"
+"Diese Option sollte aktiviert sein, wenn 3D-Fenster aufgenommen werden.\n"
"Sie ist auch automatisch aktiviert,\n"
-"wenn mit bekannten 3D Fenster Manager aufgenommen wird.\n"
+"wenn mit bekanntem 3D-Fenstermanager aufgenommen wird.\n"
+" "
#: src/rmdStrings.py:88
msgid "Number of audio channels."
@@ -460,11 +464,11 @@
#: src/rmdStrings.py:90
msgid "ALSA sound device, that is used for sound recording."
-msgstr "ALSA audio Gerät, das zur Audioaufnahme verwendet wird."
+msgstr "ALSA-Audiogerät, das zur Audioaufnahme verwendet wird"
#: src/rmdStrings.py:91
msgid "Connection to the Xserver."
-msgstr "Verbindung zum Xserver."
+msgstr "Verbindung zum X-Server"
#: src/rmdStrings.py:92
msgid ""
@@ -474,10 +478,9 @@
"You can also disable cursor drawing."
msgstr ""
"Mauszeiger, der angezeigt wird.\n"
-"Mit >Normal< ist der Systemmauszeiger gemeint,der während der Aufnahme "
-"angezeigt wird,\n"
-"wo hingegen >Schwarz< und >Weiß< Mauszeiger sind, die vom Programm angezeigt "
-"werden."
+"„Normal“ ist der Systemmauszeiger; „Schwarz“ und „Weiß“ sind Mauszeiger,\n"
+"die vom Programm angezeigt werden.\n"
+"„Keiner“ zeichnet keinen Mauszeiger."
#: src/rmdStrings.py:93
msgid ""
@@ -487,6 +490,9 @@
"every frame, so it's not recommended\n"
"for large capture areas."
msgstr ""
+"Ist diese Option aktiviert, folgt der Aufnahmebereich dem Mauszeiger.\n"
+"Diese Option aktiviert auch die Vollbildaufnahme in jedem Bild,\n"
+"daher wird es nicht empfohlen für große Aufnahmebereiche."
#: src/rmdStrings.py:94
msgid ""
@@ -495,23 +501,26 @@
"Disabling this option is not recommended,\n"
"as it may severely slow down the program."
msgstr ""
-"Vernwenden Sie, entsprechend der anderen Programm Einstellungen, immer wenn "
-"möglich,\n"
-"die MIT-Shared memory Erweiterung.\n"
-"Diese Option zu deaktivieren ist nicht empfehlenswert\n"
-"da starke Leistungeinbusen des Programms die Folge sind."
+"Es wird, wenn möglich, entsprechend der anderen Programmeinstellungen,\n"
+"die MIT-Shared-memory-Erweiterung benutzt.\n"
+"Diese Option zu deaktivieren ist nicht empfehlenswert,\n"
+"da starke Leistungeinbußen des Programms die Folge sind."
#: src/rmdStrings.py:95
msgid ""
"When selecting a window via the \"Select Window\" button,\n"
"include that window's decorations in the recording area."
msgstr ""
+"Die Fensterdekoration in den Aufnahmebereich einbeziehen, wenn das Fenster "
+"über „Fenster auswählen“ ausgewählt wird."
#: src/rmdStrings.py:96
msgid ""
"Enable or disable tooltips, like this one.\n"
"(Requires restart)"
msgstr ""
+"Tooltips (wie diesen hier) ein- oder ausschalten. Benötigt einen Neustart "
+"des Programms."
#: src/rmdStrings.py:97
msgid ""
@@ -519,12 +528,15 @@
"that will get captured.\n"
"(This frame will remain throughout the recording.)"
msgstr ""
+"Einen Rahmen um den Aufnahmebereich auf den Bildschirm zeichen.\n"
+"(Dieser Rahmen bleibt auch während der Aufnahme.)"
#: src/rmdStrings.py:98
msgid ""
"Reset capture area after every recording\n"
"and at program shutdown."
msgstr ""
+"Aufnahmebereich nach der Aufnahme und dem Beenden des Programms zurücksetzen."
#: src/rmdStrings.py:99
msgid ""
@@ -534,6 +546,11 @@
"they would in the commandline (i.e. separated with spaces).\n"
"Consult the manpage for more information on using them."
msgstr ""
+"<qt>Weitere Kommandozeilenparameter, die recordMyDesktop "
+"bei der Initialisierung übergeben werden. "
+"Diese Parameter müssen im selben Format angegeben werden wie "
+"auf der Konsole (z.B. durch Leerzeichen getrennt). "
+"Für Informationen über die Parameter, siehe Manpage.</qt>"
#: src/rmdStrings.py:100
msgid ""
@@ -545,40 +562,47 @@
"recordMyDesktop must be compiled with JACK\n"
"support for this option to work."
msgstr ""
+"<qt>Diese Option aktivieren, um JACK für die Audioaufnahme zu benutzen. "
+"Der JACK-Server muss laufen, um die Ports zu finden, die aufgenommen werden. "
+"Die Aufnahme aus jedem Port wird in einen separaten Kanal geschrieben. "
+"Damit diese Option funktioniert, muss recordMyDesktop "
+"mit JACK-Unterstützung kompiliert worden sein.</qt>"
#: src/rmdStrings.py:102
msgid "Use Jack for audio capture."
-msgstr ""
+msgstr "JACK für Audioaufnahme benutzen"
#: src/rmdStrings.py:103
msgid ""
"Select the ports you want to record from\n"
"(hold Ctrl to select multiple entries):"
msgstr ""
+"Wählen Sie die Ports, von denen aufgenommen werden soll.\n"
+"Drücken sie Strg, um mehrere Einträge zu wählen."
#: src/rmdStrings.py:105
msgid "Available Ports"
-msgstr ""
+msgstr "Verfügbare Ports"
#: src/rmdStrings.py:106
msgid "jack_lsp returned no ports."
-msgstr ""
+msgstr "jack_lsp zeigt keine Ports an"
#: src/rmdStrings.py:107
msgid "Make sure that jackd is running."
-msgstr ""
+msgstr "Stellen Sie sicher, dass jackd läuft."
#: src/rmdStrings.py:108
msgid "Available ports (double click to add):"
-msgstr ""
+msgstr "Verfügbare Ports (doppelklicken zum Hinzufügen):"
#: src/rmdStrings.py:109
msgid "Selected ports (double click to remove):"
-msgstr ""
+msgstr "Ausgewählte Ports (doppelklicken zum Entfernen):"
#: src/rmdStrings.py:110
msgid "Refresh"
-msgstr ""
+msgstr "Aktualisieren"
#~ msgid "gtk-recordMyDesktop"
#~ msgstr "gtk-recordMyDesktop"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-11-08 18:32:53
|
Revision: 601
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=601&view=rev
Author: enselic
Date: 2009-11-08 18:32:44 +0000 (Sun, 08 Nov 2009)
Log Message:
-----------
Fix "uint_32_t truncation of cache compression statistics"
Apply patch from Piotr Engelking that fix integer overflow issues
for cache statistics. The patch is attached to this bug report:
recordmydesktop: uint_32_t truncation of cache compression statistics
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549263
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_cache_frame.c
Modified: trunk/recordmydesktop/src/rmd_cache_frame.c
===================================================================
--- trunk/recordmydesktop/src/rmd_cache_frame.c 2009-06-05 16:26:52 UTC (rev 600)
+++ trunk/recordmydesktop/src/rmd_cache_frame.c 2009-11-08 18:32:44 UTC (rev 601)
@@ -271,7 +271,7 @@
unsigned int bytes_per_pixel = pdata->specs.depth >= 24 ? 4 : 2;
unsigned int pixels_per_frame = pdata->brwin.rrect.width * pdata->brwin.rrect.height;
- total_received_bytes = ((unsigned int)frameno) * bytes_per_pixel * pixels_per_frame;
+ total_received_bytes = ((unsigned long long int)frameno) * bytes_per_pixel * pixels_per_frame;
}
if(total_received_bytes){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-06-05 16:27:12
|
Revision: 600
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=600&view=rev
Author: enselic
Date: 2009-06-05 16:26:52 +0000 (Fri, 05 Jun 2009)
Log Message:
-----------
Apply patch from Dominic Evans that fixes capturing of window
decorations when compiz is running.
Modified Paths:
--------------
trunk/gtk-recordmydesktop/ChangeLog
trunk/gtk-recordmydesktop/src/rmdSimple.py
Modified: trunk/gtk-recordmydesktop/ChangeLog
===================================================================
--- trunk/gtk-recordmydesktop/ChangeLog 2009-03-12 07:09:01 UTC (rev 599)
+++ trunk/gtk-recordmydesktop/ChangeLog 2009-06-05 16:26:52 UTC (rev 600)
@@ -1,3 +1,7 @@
+/*VERSION 0.3.9 unreleased*/
+* Fix selection of window (including frame) on compiz
+* ...
+
/*VERSION 0.3.8*/
* nl.po added Dutch translation by Jos Poortvliet
* Applied patch by freedo, to Replace GtkFileSelection with
Modified: trunk/gtk-recordmydesktop/src/rmdSimple.py
===================================================================
--- trunk/gtk-recordmydesktop/src/rmdSimple.py 2009-03-12 07:09:01 UTC (rev 599)
+++ trunk/gtk-recordmydesktop/src/rmdSimple.py 2009-06-05 16:26:52 UTC (rev 600)
@@ -39,7 +39,9 @@
import gtk.gdk
import gobject
import gc
+import sys
import re
+from subprocess import Popen,PIPE
import rmdPrefsWidget as pW
import rmdSelectThumb as sT
from rmdStrings import *
@@ -217,14 +219,39 @@
self.__fileSelQuit__()
def __select_window__(self,button):
- xwininfo_com=['xwininfo','-frame']
- if self.values[21]==1:
- xwininfo_com=['xwininfo']
- (stdin,stdout,stderr)=os.popen3(xwininfo_com,'t')
- wid=stdout.readlines()
- stdin.close()
- stdout.close()
- stderr.close()
+ # check user has not disabled capture of window decoration
+ if self.values[21]!=1:
+ # else work out the size including decoration (also taking into account compiz)
+ p = Popen(['xwininfo','-frame'],stdout=PIPE)
+ pattern = re.compile('^xwininfo: Window id: (0x[0-9a-fA-F]+)')
+
+ while True:
+ o = p.stdout.readline()
+ if o == '' and p.poll() != None: break
+ match = pattern.search(o)
+ if match:
+ fid = match.group(1)
+ break
+
+ p = Popen(['xprop','-id',fid,'_NET_FRAME_WINDOW'],stdout=PIPE)
+ pattern = re.compile('^_NET_FRAME_WINDOW\(WINDOW\): window id # (0x[0-9a-fA-F]+)')
+
+ while True:
+ o = p.stdout.readline()
+ if o == '' and p.poll() != None: break
+ match = pattern.search(o)
+ if match:
+ wid = match.group(1)
+ break
+ else:
+ print pattern
+ print o
+
+ if wid: xwininfo_com = ['xwininfo','-id',wid]
+ else: xwininfo_com = ['xwininfo']
+ p = Popen(xwininfo_com,stdout=PIPE)
+ wid=p.stdout.readlines()
+
x=y=width=height=None
for i in wid:
if i.lstrip().startswith('Absolute upper-left X:'):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-03-12 07:09:09
|
Revision: 599
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=599&view=rev
Author: enselic
Date: 2009-03-12 07:09:01 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
Applied patch from Kevin Lo that fixes compilation on FreeBSD by
addressing include and format string issues.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd.c
trunk/recordmydesktop/src/rmd_cache.c
trunk/recordmydesktop/src/rmd_cache_frame.c
trunk/recordmydesktop/src/rmd_capture_sound.c
trunk/recordmydesktop/src/rmd_flush_to_ogg.c
trunk/recordmydesktop/src/rmd_get_frame.c
trunk/recordmydesktop/src/rmd_make_dummy_pointer.c
trunk/recordmydesktop/src/rmd_queryextensions.c
trunk/recordmydesktop/src/rmd_rescue.c
trunk/recordmydesktop/src/rmd_specsfile.c
trunk/recordmydesktop/src/rmd_timer.c
Modified: trunk/recordmydesktop/src/rmd.c
===================================================================
--- trunk/recordmydesktop/src/rmd.c 2009-01-11 14:33:07 UTC (rev 598)
+++ trunk/recordmydesktop/src/rmd.c 2009-03-12 07:09:01 UTC (rev 599)
@@ -43,6 +43,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <errno.h>
int main(int argc,char **argv){
Modified: trunk/recordmydesktop/src/rmd_cache.c
===================================================================
--- trunk/recordmydesktop/src/rmd_cache.c 2009-01-11 14:33:07 UTC (rev 598)
+++ trunk/recordmydesktop/src/rmd_cache.c 2009-03-12 07:09:01 UTC (rev 599)
@@ -30,6 +30,8 @@
#include "rmd_specsfile.h"
#include "rmd_types.h"
+#include <sys/types.h>
+#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
Modified: trunk/recordmydesktop/src/rmd_cache_frame.c
===================================================================
--- trunk/recordmydesktop/src/rmd_cache_frame.c 2009-01-11 14:33:07 UTC (rev 598)
+++ trunk/recordmydesktop/src/rmd_cache_frame.c 2009-03-12 07:09:01 UTC (rev 599)
@@ -34,6 +34,7 @@
#include <signal.h>
#include <string.h>
#include <stdio.h>
+#include <stdlib.h>
#include <errno.h>
#include <math.h>
Modified: trunk/recordmydesktop/src/rmd_capture_sound.c
===================================================================
--- trunk/recordmydesktop/src/rmd_capture_sound.c 2009-01-11 14:33:07 UTC (rev 598)
+++ trunk/recordmydesktop/src/rmd_capture_sound.c 2009-03-12 07:09:01 UTC (rev 599)
@@ -34,6 +34,10 @@
#include <pthread.h>
#include <string.h>
#include <errno.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
+#include <stdlib.h>
void *rmdCaptureSound(ProgData *pdata){
Modified: trunk/recordmydesktop/src/rmd_flush_to_ogg.c
===================================================================
--- trunk/recordmydesktop/src/rmd_flush_to_ogg.c 2009-01-11 14:33:07 UTC (rev 598)
+++ trunk/recordmydesktop/src/rmd_flush_to_ogg.c 2009-03-12 07:09:01 UTC (rev 599)
@@ -36,6 +36,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
+#include <unistd.h>
Modified: trunk/recordmydesktop/src/rmd_get_frame.c
===================================================================
--- trunk/recordmydesktop/src/rmd_get_frame.c 2009-01-11 14:33:07 UTC (rev 598)
+++ trunk/recordmydesktop/src/rmd_get_frame.c 2009-03-12 07:09:01 UTC (rev 599)
@@ -43,6 +43,7 @@
#include <pthread.h>
#include <sys/shm.h>
#include <errno.h>
+#include <stdlib.h>
#define AVG_4_PIXELS(data_array,width_img,k_tm,i_tm,offset)\
Modified: trunk/recordmydesktop/src/rmd_make_dummy_pointer.c
===================================================================
--- trunk/recordmydesktop/src/rmd_make_dummy_pointer.c 2009-01-11 14:33:07 UTC (rev 598)
+++ trunk/recordmydesktop/src/rmd_make_dummy_pointer.c 2009-03-12 07:09:01 UTC (rev 599)
@@ -31,8 +31,8 @@
#include "rmd_types.h"
#include <X11/Xlib.h>
+#include <stdlib.h>
-
unsigned char *rmdMakeDummyPointer(Display *display,
DisplaySpecs *specs,
int size,
Modified: trunk/recordmydesktop/src/rmd_queryextensions.c
===================================================================
--- trunk/recordmydesktop/src/rmd_queryextensions.c 2009-01-11 14:33:07 UTC (rev 598)
+++ trunk/recordmydesktop/src/rmd_queryextensions.c 2009-03-12 07:09:01 UTC (rev 599)
@@ -32,6 +32,7 @@
#include <X11/extensions/shape.h>
#include <X11/extensions/Xfixes.h>
#include <X11/extensions/Xdamage.h>
+#include <stdlib.h>
Modified: trunk/recordmydesktop/src/rmd_rescue.c
===================================================================
--- trunk/recordmydesktop/src/rmd_rescue.c 2009-01-11 14:33:07 UTC (rev 598)
+++ trunk/recordmydesktop/src/rmd_rescue.c 2009-03-12 07:09:01 UTC (rev 599)
@@ -37,6 +37,7 @@
#include <pthread.h>
#include <string.h>
+#include <stdlib.h>
int rmdRescue(const char *path){
Modified: trunk/recordmydesktop/src/rmd_specsfile.c
===================================================================
--- trunk/recordmydesktop/src/rmd_specsfile.c 2009-01-11 14:33:07 UTC (rev 598)
+++ trunk/recordmydesktop/src/rmd_specsfile.c 2009-03-12 07:09:01 UTC (rev 599)
@@ -51,9 +51,9 @@
fprintf(fp,"NoSound = %d\n",pdata->args.nosound);
fprintf(fp,"Frequency = %d\n",pdata->args.frequency);
fprintf(fp,"Channels = %d\n",pdata->args.channels);
- fprintf(fp,"BufferSize = %lu\n",pdata->args.buffsize);
+ fprintf(fp,"BufferSize = %lu\n",(unsigned long)pdata->args.buffsize);
fprintf(fp,"SoundFrameSize = %d\n",pdata->sound_framesize);
- fprintf(fp,"PeriodSize = %lu\n",pdata->periodsize);
+ fprintf(fp,"PeriodSize = %lu\n",(unsigned long)pdata->periodsize);
fprintf(fp,"UsedJack = %d\n",pdata->args.use_jack);
fprintf(fp,"v_bitrate = %d\n",pdata->args.v_bitrate);
fprintf(fp,"v_quality = %d\n",pdata->args.v_quality);
@@ -119,7 +119,8 @@
fprintf(stderr,"Error reading Channels attribute!!!\n");
return 1;
}
- if(fscanf(fp,"BufferSize = %lu\n",&pdata->args.buffsize)!=1){
+ if(fscanf(fp,"BufferSize = %lu\n",
+ (unsigned long *)&pdata->args.buffsize)!=1){
fprintf(stderr,"Error reading BufferSize attribute!!!\n");
return 1;
}
@@ -127,7 +128,8 @@
fprintf(stderr,"Error reading SoundFrameSize attribute!!!\n");
return 1;
}
- if(fscanf(fp,"PeriodSize = %lu\n",&pdata->periodsize)!=1){
+ if(fscanf(fp,"PeriodSize = %lu\n",
+ (unsigned long *)&pdata->periodsize)!=1){
fprintf(stderr,"Error reading PeriodSize attribute!!!\n");
return 1;
}
Modified: trunk/recordmydesktop/src/rmd_timer.c
===================================================================
--- trunk/recordmydesktop/src/rmd_timer.c 2009-01-11 14:33:07 UTC (rev 598)
+++ trunk/recordmydesktop/src/rmd_timer.c 2009-03-12 07:09:01 UTC (rev 599)
@@ -34,6 +34,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
+#include <unistd.h>
void *rmdTimer(ProgData *pdata){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-11 14:33:11
|
Revision: 598
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=598&view=rev
Author: enselic
Date: 2009-01-11 14:33:07 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
src/rmd_parseargs.c: Remove 'static' keyword (which belonged to an
incomplete static variable declaration).
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_parseargs.c
Modified: trunk/recordmydesktop/src/rmd_parseargs.c
===================================================================
--- trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 14:29:19 UTC (rev 597)
+++ trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 14:33:07 UTC (rev 598)
@@ -434,7 +434,6 @@
static boolean rmdValidateArguments(const ProgArgs *args)
{
- static
boolean success = TRUE;
if (args->x < 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-11 14:29:29
|
Revision: 597
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=597&view=rev
Author: enselic
Date: 2009-01-11 14:29:19 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
src/rmd_parseargs.c: Remove comment that accidentally was commited.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_parseargs.c
Modified: trunk/recordmydesktop/src/rmd_parseargs.c
===================================================================
--- trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 11:54:29 UTC (rev 596)
+++ trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 14:29:19 UTC (rev 597)
@@ -64,8 +64,7 @@
static void rmdPrintAndExit(poptContext con, enum poptCallbackReason reason, const struct poptOption *opt, const char *arg, const void *data);
static boolean rmdValidateArguments(const ProgArgs *args);
-// Note: print-config only shown in Generic, in man tis also shown in
-// Misc (less complciate code that way)
+
boolean rmdParseArgs(int argc, char **argv, ProgArgs *arg_return) {
poptContext popt_context = NULL;
boolean no_cursor = FALSE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-11 12:32:33
|
Revision: 595
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=595&view=rev
Author: enselic
Date: 2009-01-11 11:45:46 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
src/rmd_parseargs.c: Fix minor formating issues.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_parseargs.c
Modified: trunk/recordmydesktop/src/rmd_parseargs.c
===================================================================
--- trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 11:41:58 UTC (rev 594)
+++ trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 11:45:46 UTC (rev 595)
@@ -363,19 +363,16 @@
arg = poptGetOptArg(popt_context);
}
- if (arg_return->jack_nports > 0)
- {
+ if (arg_return->jack_nports > 0) {
arg_return->use_jack = 1;
}
- else
- {
+ else {
fprintf(stderr,
"Argument Usage: --use-jack port1 port2... portn\n");
success = FALSE;
}
- if (RMD_USE_JACK_EXTRA_FLAG == POPT_ARGFLAG_DOC_HIDDEN)
- {
+ if (RMD_USE_JACK_EXTRA_FLAG == POPT_ARGFLAG_DOC_HIDDEN) {
fprintf(stderr,
"Warning, will ignore --use-jack flags, no libjack support in build.\n");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-11 12:32:18
|
Revision: 596
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=596&view=rev
Author: enselic
Date: 2009-01-11 11:54:29 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
src/rmd_parseargs.c: Stop parsing on error and report the error.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_parseargs.c
Modified: trunk/recordmydesktop/src/rmd_parseargs.c
===================================================================
--- trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 11:45:46 UTC (rev 595)
+++ trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 11:54:29 UTC (rev 596)
@@ -383,22 +383,47 @@
}
}
- // Parsing is complete, perform final adjustments
- if (no_cursor)
- arg_return->xfixes_cursor = FALSE;
+ if (arg_id == -1) {
+ // Parsing is complete, perform final adjustments
+ if (no_cursor)
+ arg_return->xfixes_cursor = FALSE;
- if (quick_subsampling)
- arg_return->no_quick_subsample = FALSE;
+ if (quick_subsampling)
+ arg_return->no_quick_subsample = FALSE;
- if (compress_cache)
- arg_return->zerocompression = FALSE;
+ if (compress_cache)
+ arg_return->zerocompression = FALSE;
- if (arg_return->follow_mouse)
- arg_return->full_shots = TRUE;
+ if (arg_return->follow_mouse)
+ arg_return->full_shots = TRUE;
- if (!arg_return->filename)
- arg_return->filename = strdup(poptGetArg(popt_context));
+ if (!arg_return->filename)
+ arg_return->filename = strdup(poptGetArg(popt_context));
+ }
+ else {
+ // Parsing error, say what went wrong
+ const char *str = poptBadOption(popt_context, 0);
+ success = FALSE;
+
+ fprintf(stderr,
+ "Error when parsing `%s': ", str);
+
+ switch (arg_id) {
+ case POPT_ERROR_NOARG:
+ fprintf(stderr, "Missing argument\n");
+ break;
+
+ case POPT_ERROR_BADNUMBER:
+ fprintf(stderr, "Bad number\n");
+ break;
+
+ default:
+ fprintf(stderr, "libpopt error: %d\n", arg_id);
+ break;
+ }
+ }
+
// Make sure argument ranges are valid
success = success && rmdValidateArguments(arg_return);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-11 12:31:42
|
Revision: 593
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=593&view=rev
Author: enselic
Date: 2009-01-11 11:39:18 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
configure.ac: Link with libpopt.
src/rmd_parseargs.c: Port to libpopt.
Modified Paths:
--------------
trunk/recordmydesktop/configure.ac
trunk/recordmydesktop/src/rmd_parseargs.c
Modified: trunk/recordmydesktop/configure.ac
===================================================================
--- trunk/recordmydesktop/configure.ac 2009-01-11 11:08:25 UTC (rev 592)
+++ trunk/recordmydesktop/configure.ac 2009-01-11 11:39:18 UTC (rev 593)
@@ -73,6 +73,7 @@
AC_CHECK_LIB([m],[isnan],,)
AC_CHECK_LIB([z],[deflate],,AC_MSG_ERROR([Can't find zlib]))
+AC_CHECK_LIB([popt], poptSetOtherOptionHelp,,AC_MSG_ERROR([Can't find libpopt]))
AC_CHECK_LIB([ICE],[IceOpenConnection],,AC_MSG_ERROR([Can't find libICE]),)
AC_CHECK_LIB([SM],[SmcOpenConnection],,AC_MSG_ERROR([Can't find libSM]),)
AC_CHECK_LIB([X11],[XOpenDisplay],,AC_MSG_ERROR([Can't find libX11]),
Modified: trunk/recordmydesktop/src/rmd_parseargs.c
===================================================================
--- trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 11:08:25 UTC (rev 592)
+++ trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 11:39:18 UTC (rev 593)
@@ -3,6 +3,7 @@
*******************************************************************************
* *
* Copyright (C) 2006,2007,2008 John Varouhakis *
+* Copyright (C) 2009 Martin Nordholts *
* *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -29,6 +30,8 @@
#include "rmd_types.h"
+#include <popt.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -36,8 +39,10 @@
#ifdef HAVE_LIBJACK
#define RMD_LIBJACK_STATUS "Enabled"
+#define RMD_USE_JACK_EXTRA_FLAG 0
#else
#define RMD_LIBJACK_STATUS "Disabled"
+#define RMD_USE_JACK_EXTRA_FLAG POPT_ARGFLAG_DOC_HIDDEN
#endif
#ifdef HAVE_LIBASOUND
@@ -46,522 +51,446 @@
#define RMD_LIBASOUND_STATUS "OSS"
#endif
-static void rmdPrintConfig(void) {
- fprintf(stderr,
- "\n"
- "recordMyDesktop was compiled with the following options:\n"
- "\n"
- "Jack:\t\t\t" RMD_LIBJACK_STATUS "\n"
- "Default Audio Backend:\t" RMD_LIBASOUND_STATUS "\n"
- "\n"
- "\n");
-}
+#define RMD_ARG_DELAY 1
+#define RMD_ARG_DUMMY_CURSOR 2
+#define RMD_ARG_USE_JACK 3
+#define RMD_OPTION_TABLE(name, table) \
+ { NULL, '\0', \
+ POPT_ARG_INCLUDE_TABLE, (table), \
+ 0, (name), NULL }
+
+
+static void rmdPrintAndExit(poptContext con, enum poptCallbackReason reason, const struct poptOption *opt, const char *arg, const void *data);
+static boolean rmdValidateArguments(const ProgArgs *args);
+
+// Note: print-config only shown in Generic, in man tis also shown in
+// Misc (less complciate code that way)
boolean rmdParseArgs(int argc, char **argv, ProgArgs *arg_return) {
- int i;
- char *usage =
- "\n"
- "Usage:\n"
- "\trecordmydesktop [OPTIONS]^filename\n"
- "\n"
- "\n"
- "General Options:\n"
- "\t-h or --help\t\tPrint this help and exit.\n"
- "\t--version\t\tPrint program version and exit.\n"
- "\t--print-config\t\tPrint info about options selected during compilation and exit.\n"
- "\n"
- "Image Options:\n"
- "\t--windowid id_of_window\tid of window to be recorded.\n"
- "\t--display DISPLAY\tDisplay to connect to.\n"
- "\t-x X\t\t\tOffset in x direction.\n"
- "\t-y Y\t\t\tOffset in y direction.\n"
- "\t--width N\t\tWidth of recorded window.\n"
- "\t--height N\t\tHeight of recorded window.\n"
- "\n"
- "\t--dummy-cursor color\tColor of the dummy cursor [black|white]\n"
- "\t--no-cursor\t\tDisable drawing of the cursor.\n"
- "\t--no-shared\t\tDisable usage of MIT-shared memory extension(Not Recommended!).\n"
- "\t--full-shots\t\tTake full screenshot at every frame(Not recomended!).\n"
- "\t--quick-subsampling\tDo subsampling of the chroma planes by discarding,not averaging.\n"
- "\t--fps N(number>0.0)\tA positive number denoting desired framerate.\n"
- "\n"
- "Sound Options:\n"
- "\t--channels N\t\t\tA positive number denoting desired sound channels in recording.\n"
- "\t--freq N\t\t\tA positive number denoting desired sound frequency.\n"
- "\t--buffer-size N\t\t\tA positive number denoting the desired sound buffer size (in frames,when using ALSA or OSS)\n"
- "\t--ring-buffer-size N\t\tA float number denoting the desired ring buffer size (in seconds,when using JACK only).\n"
- "\t--device SOUND_DEVICE\t\tSound device(default " DEFAULT_AUDIO_DEVICE ").\n"
- "\t--use-jack port1 port2... portn\tRecord audio from the specified list of space-separated jack ports.\n"
- "\t--no-sound\t\t\tDo not record sound.\n"
- "\n"
- "Encoding Options\n"
- "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n"
- "\t--v_quality n\t\tA number from 0 to 63 for desired encoded video quality(default 63).\n"
- "\t--v_bitrate n\t\tA number from 45000 to 2000000 for desired encoded video bitrate(default 45000).\n"
- "\t--s_quality n\t\tDesired audio quality(-1 to 10).\n"
- "\n"
- "Misc Options:\n"
- "\t--rescue path_to_data\t\tEncode data from a previous, crashed, session.\n"
- "\t--no-wm-check\t\t\tDo not try to detect the window manager(and set options according to it)\n"
- "\t--pause-shortcut MOD+KEY\tShortcut that will be used for (un)pausing (default Control+Mod1+p).\n"
- "\t--stop-shortcut MOD+KEY\t\tShortcut that will be used to stop the recording (default Control+Mod1+s).\n"
- "\t--compress-cache\t\tImage data are cached with light compression.\n"
- "\t--workdir DIR\t\t\tLocation where a temporary directory will be created to hold project files(default $HOME).\n"
- "\t--delay n[H|h|M|m]\t\tNumber of secs(default),minutes or hours before capture starts(number can be float)\n"
- "\t--overwrite\t\t\tIf there is already a file with the same name, delete it (default is to add a number postfix to the new one).\n"
- "\t-o filename\t\t\tName of recorded video(default out.ogv).\n"
- "\n"
- "\tIf no other options are specified, filename can be given without the -o switch.\n"
- "\n"
- "\n";
+ poptContext popt_context = NULL;
+ boolean no_cursor = FALSE;
+ boolean quick_subsampling = FALSE;
+ boolean compress_cache = FALSE;
+ boolean success = TRUE;
+ int arg_id = 0;
- if(argc==2){
- if(argv[1][0]!='-'){
- free(arg_return->filename);
- arg_return->filename=malloc(strlen(argv[1])+1);
- strcpy(arg_return->filename,argv[1]);
- return TRUE;
- }
- }
- for(i=1;i<argc;i++){
- if (strcmp(argv[i], "--delay") == 0) {
- if(i+1<argc){
- float num=atof(argv[i+1]);
- if(num>0.0){
+ // Setup the option tables
+ struct poptOption generic_options[] = {
+ { NULL, '\0',
+ POPT_ARG_CALLBACK, (void *)rmdPrintAndExit, 0,
+ NULL, NULL },
+
+ { "help", 'h',
+ POPT_ARG_NONE, NULL, 0,
+ "Print this help and exit.",
+ NULL },
+
+ { "version", '\0',
+ POPT_ARG_NONE, NULL, 0,
+ "Print program version and exit.",
+ NULL },
+
+ { "print-config", '\0',
+ POPT_ARG_NONE, NULL, 0,
+ "Print info about options selected during compilation and exit.",
+ NULL },
+
+ POPT_TABLEEND };
+
+ struct poptOption image_options[] = {
+ { "windowid", '\0',
+ POPT_ARG_INT, &arg_return->windowid, 0,
+ "id of window to be recorded.",
+ "id_of_window" },
+
+ { "display", '\0',
+ POPT_ARG_STRING, &arg_return->display, 0,
+ "Display to connect to.",
+ "DISPLAY" },
+
+ { NULL, 'x',
+ POPT_ARG_INT, &arg_return->x, 0,
+ "Offset in x direction.",
+ "N>=0" },
+
+ { NULL, 'y',
+ POPT_ARG_INT, &arg_return->y, 0,
+ "Offset in y direction.",
+ "N>=0" },
+
+ { "width", '\0',
+ POPT_ARG_INT, &arg_return->width, 0,
+ "Width of recorded window.",
+ "N>0" },
+
+ { "height", '\0',
+ POPT_ARG_INT, &arg_return->height, 0,
+ "Height of recorded window.",
+ "N>0" },
+
+ { "dummy-cursor", '\0',
+ POPT_ARG_STRING, NULL, RMD_ARG_DUMMY_CURSOR,
+ "Color of the dummy cursor [black|white]",
+ "color" },
+
+ { "no-cursor", '\0',
+ POPT_ARG_NONE, &no_cursor, 0,
+ "Disable drawing of the cursor.",
+ NULL },
+
+ { "no-shared", '\0',
+ POPT_ARG_NONE, &arg_return->noshared, 0,
+ "Disable usage of MIT-shared memory extension(Not Recommended!).",
+ NULL },
+
+ { "full-shots", '\0',
+ POPT_ARG_NONE, &arg_return->full_shots, 0,
+ "Take full screenshot at every frame(Not recomended!).",
+ NULL },
+
+ { "follow-mouse", '\0',
+ POPT_ARG_NONE, &arg_return->follow_mouse, 0,
+ "Makes the capture area follow the mouse cursor. Autoenables --full-shots.",
+ NULL },
+
+ { "quick-subsampling", '\0',
+ POPT_ARG_NONE, &quick_subsampling, 0,
+ "Do subsampling of the chroma planes by discarding, not averaging.",
+ NULL },
+
+ { "fps", '\0',
+ POPT_ARG_FLOAT, &arg_return->fps, 0,
+ "A positive number denoting desired framerate.",
+ "N(number>0.0)" },
+
+ POPT_TABLEEND };
+
+ struct poptOption sound_options[] = {
+ { "channels", '\0',
+ POPT_ARG_INT, &arg_return->channels, 0,
+ "A positive number denoting desired sound channels in recording.",
+ "N" },
+
+ { "freq", '\0',
+ POPT_ARG_INT, &arg_return->frequency, 0,
+ "A positive number denoting desired sound frequency.",
+ "N" },
+
+ { "buffer-size", '\0',
+ POPT_ARG_INT, &arg_return->buffsize, 0,
+ "A positive number denoting the desired sound buffer size (in frames,when using ALSA or OSS)",
+ "N" },
+
+ { "ring-buffer-size", '\0',
+ POPT_ARG_FLOAT, &arg_return->jack_ringbuffer_secs, 0,
+ "A float number denoting the desired ring buffer size (in seconds,when using JACK only).",
+ "N" },
+
+ { "device", '\0',
+ POPT_ARG_STRING, &arg_return->device, 0,
+ "Sound device(default " DEFAULT_AUDIO_DEVICE ").",
+ "SOUND_DEVICE" },
+
+ { "use-jack", '\0',
+ POPT_ARG_STRING | RMD_USE_JACK_EXTRA_FLAG, &arg_return->x, RMD_ARG_USE_JACK,
+ "Record audio from the specified list of space-separated jack ports.",
+ "port1 port2... portn" },
+
+ { "no-sound", '\0',
+ POPT_ARG_NONE, &arg_return->nosound, 0,
+ "Do not record sound.",
+ NULL },
+
+ POPT_TABLEEND };
+
+ struct poptOption encoding_options[] = {
+ { "on-the-fly-encoding", '\0',
+ POPT_ARG_NONE, &arg_return->encOnTheFly, 0,
+ "Encode the audio-video data, while recording.",
+ NULL },
+
+ { "v_quality", '\0',
+ POPT_ARG_INT, &arg_return->v_quality, 0,
+ "A number from 0 to 63 for desired encoded video quality(default 63).",
+ "n" },
+
+ { "v_bitrate", '\0',
+ POPT_ARG_INT, &arg_return->v_bitrate, 0,
+ "A number from 45000 to 2000000 for desired encoded video bitrate(default 45000).",
+ "n" },
+
+ { "s_quality", '\0',
+ POPT_ARG_INT, &arg_return->s_quality, 0,
+ "Desired audio quality(-1 to 10).",
+ "n" },
+
+ POPT_TABLEEND };
+
+ struct poptOption misc_options[] = {
+ { "rescue", '\0',
+ POPT_ARG_STRING, &arg_return->rescue_path, 0,
+ "Encode data from a previous, crashed, session.",
+ "path_to_data" },
+
+ { "no-encode", '\0',
+ POPT_ARG_NONE | POPT_ARGFLAG_DOC_HIDDEN, &arg_return->no_encode, 0,
+ "Do not encode any data after recording is complete. This is instead done manually afterwards with --rescue.",
+ NULL },
+
+ { "no-wm-check", '\0',
+ POPT_ARG_NONE, &arg_return->nowmcheck, 0,
+ "Do not try to detect the window manager(and set options according to it)",
+ NULL },
+
+ { "no-frame", '\0',
+ POPT_ARG_NONE, &arg_return->noframe, 0,
+ "Don not show the frame that visualizes the recorded area.",
+ NULL },
+
+ { "pause-shortcut", '\0',
+ POPT_ARG_STRING, &arg_return->pause_shortcut, 0,
+ "Shortcut that will be used for (un)pausing (default Control+Mod1+p).",
+ "MOD+KEY" },
+
+ { "stop-shortcut", '\0',
+ POPT_ARG_STRING, &arg_return->stop_shortcut, 0,
+ "Shortcut that will be used to stop the recording (default Control+Mod1+s).",
+ "MOD+KEY" },
+
+ { "compress-cache", '\0',
+ POPT_ARG_NONE, &compress_cache, 0,
+ "Image data are cached with light compression.",
+ NULL },
+
+ { "workdir", '\0',
+ POPT_ARG_STRING, &arg_return->workdir, 0,
+ "Location where a temporary directory will be created to hold project files(default $HOME).",
+ "DIR" },
+
+ { "delay", '\0',
+ POPT_ARG_STRING, &arg_return->delay, RMD_ARG_DELAY,
+ "Number of secs(default),minutes or hours before capture starts(number can be float)",
+ "n[H|h|M|m]" },
+
+ { "overwrite", '\0',
+ POPT_ARG_NONE, &arg_return->overwrite, 0,
+ "If there is already a file with the same name, delete it (default is to add a number postfix to the new one).",
+ NULL },
+
+ { NULL, 'o',
+ POPT_ARG_STRING, &arg_return->filename, 0,
+ "Name of recorded video(default out.ogv).",
+ "filename" },
+
+ POPT_TABLEEND };
+
+ struct poptOption rmd_args[] = {
+ RMD_OPTION_TABLE("Generic Options", generic_options),
+ RMD_OPTION_TABLE("Image Options", image_options),
+ RMD_OPTION_TABLE("Sound Options", sound_options),
+ RMD_OPTION_TABLE("Encoding Options", encoding_options),
+ RMD_OPTION_TABLE("Misc Options", misc_options),
+ POPT_TABLEEND };
+
+
+ // Some trivial setup
+ popt_context = poptGetContext(NULL, argc, (const char **)argv, rmd_args, 0);
+ poptSetOtherOptionHelp(popt_context, "[OPTIONS]^filename");
+
+
+ // Parse the arguments
+ while ((arg_id = poptGetNextOpt(popt_context)) > 0) {
+ char *arg = poptGetOptArg(popt_context);
+
+ // Most arguments are handled completely by libpopt but we
+ // handle some by ourself, namely those in this switch case
+ switch (arg_id) {
+ case RMD_ARG_DELAY:
+ {
+ float num = atof(arg);
+
+ if (num > 0.0) {
int k;
- for(k=0;k<strlen(argv[i+1]);k++){
- if((argv[i+1][k]=='M')||(argv[i+1][k]=='m')){
- num*=60.0;
+ for (k = 0; k < strlen(arg); k++) {
+ if ((arg[k] == 'M') || (arg[k] == 'm')) {
+ num *= 60.0;
break;
}
- else if((argv[i+1][k]=='H')||(argv[i+1][k]=='h')){
- num*=3600.0;
+ else if ((arg[k] == 'H') || (arg[k] == 'h')) {
+ num *= 3600.0;
break;
}
}
- arg_return->delay=(int)num;
+ arg_return->delay = (int) num;
}
- else{
- fprintf(stderr,"Argument Usage: --delay n[H|h|M|m]\n"
- "where n is a float number\n");
- return FALSE;
+ else {
+ fprintf(stderr,
+ "Argument Usage: --delay n[H|h|M|m]\n"
+ "where n is a float number\n");
+ success = FALSE;
}
}
- else{
- fprintf(stderr,"Argument Usage: --delay n[H|h|M|m]\n"
- "where n is a float number\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--windowid") == 0) {
- if(i+1<argc){
- Window num=strtod(argv[i+1],NULL);
- if(num>0)
- arg_return->windowid=num;
- else{
- fprintf(stderr,"Argument Usage:"
- " --windowid id_of_window(number)\n");
- return FALSE;
+ break;
+
+ case RMD_ARG_DUMMY_CURSOR:
+ {
+ if (!strcmp(arg, "white"))
+ arg_return->cursor_color = 0;
+ else if (!strcmp(arg, "black"))
+ arg_return->cursor_color = 1;
+ else {
+ fprintf(stderr,
+ "Argument Usage:\n"
+ " --dummy-cursor [black|white]\n");
+ success = FALSE;
}
+ arg_return->have_dummy_cursor = TRUE;
+ arg_return->xfixes_cursor = FALSE;
}
- else{
- fprintf(stderr,"Argument Usage:"
- " --windowid id_of_window(number)\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--display") == 0) {
- if(i+1<argc){
- if(arg_return->display!=NULL)
- free(arg_return->display);
- arg_return->display=malloc(strlen(argv[i+1])+1);
- strcpy(arg_return->display,argv[i+1]);
- }
- else{
- fprintf(stderr,"Argument Usage: --display DISPLAY\n");
- return FALSE;
- }
- i++;
- }
- else if(!strcmp(argv[i],"-x")){
- if(i+1<argc){
- int num=atoi(argv[i+1]);
- if(num>0)
- arg_return->x=num;
- else{
- fprintf(stderr,"Argument Usage: -x X(number>0)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage: -x X(number>0)\n");
- return FALSE;
- }
- i++;
- }
- else if(!strcmp(argv[i],"-y")){
- if(i+1<argc){
- int num=atoi(argv[i+1]);
- if(num>0)
- arg_return->y=num;
- else{
- fprintf(stderr,"Argument Usage: -y Y(number>0)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage: -y Y(number>0)\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--width") == 0) {
- if(i+1<argc){
- int num=atoi(argv[i+1]);
- if(num>0)
- arg_return->width=num;
- else{
- fprintf(stderr,"Argument Usage: --width N(number>0)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage: --width N(number>0)\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--height") == 0) {
- if(i+1<argc){
- int num=atoi(argv[i+1]);
- if(num>0)
- arg_return->height=num;
- else{
- fprintf(stderr,"Argument Usage: --height N(number>0)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage: --height N(number>0)\n");
- return FALSE;
- }
- i++;
- }
- else if(!strcmp(argv[i],"-o")){
- if(i+1<argc){
- free(arg_return->filename);
- arg_return->filename=malloc(strlen(argv[i+1])+1);
- strcpy(arg_return->filename,argv[i+1]);
- }
- else{
- fprintf(stderr,"Argument Usage: -o filename\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--fps") == 0) {
- if(i+1<argc){
- float num=atof(argv[i+1]);
- if(num>0.0)
- arg_return->fps=num;
- else{
- fprintf(stderr,"Argument Usage: --fps N(number>0)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage: --fps N(number>0)\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--v_quality") == 0) {
- if(i+1<argc){
- int num=atoi(argv[i+1]);
- if((num>=0)&&(num<64))
- arg_return->v_quality=num;
- else{
- fprintf(stderr,"Argument Usage:"
- " --v_quality n(number 0-63)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage:"
- " --v_quality n(number 0-63)\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--v_bitrate") == 0) {
- if(i+1<argc){
- int num=atoi(argv[i+1]);
- if((num>=45000)&&(num<=2000000))
- arg_return->v_bitrate=num;
- else{
- fprintf(stderr,"Argument Usage:"
- " --v_bitrate n(number 45000-2000000)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage:"
- " --v_bitrate n(number 45000-2000000)\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--dummy-cursor") == 0) {
- if(i+1<argc){
- if(!strcmp(argv[i+1],"white"))
- arg_return->cursor_color=0;
- else if(!strcmp(argv[i+1],"black"))
- arg_return->cursor_color=1;
- else{
- fprintf(stderr,"Argument Usage:"
- " --dummy-cursor [black|white]\n");
- return FALSE;
- }
- arg_return->have_dummy_cursor=1;
- arg_return->xfixes_cursor=0;
- }
- else{
- fprintf(stderr,"Argument Usage:"
- " --dummy-cursor [black|white]\n");
- return FALSE;
- }
- i++;
- }
- else if(!strcmp(argv[i],"--no-cursor"))
- arg_return->xfixes_cursor=0;
- else if (strcmp(argv[i], "--freq") == 0) {
- if(i+1<argc){
- int num=atoi(argv[i+1]);
- if(num>0)
- arg_return->frequency=num;
- else{
- fprintf(stderr,"Argument Usage: --freq N(number>0)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage: --freq N(number>0)\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--channels") == 0) {
- if(i+1<argc){
- int num=atoi(argv[i+1]);
- if(num>0)
- arg_return->channels=num;
- else{
- fprintf(stderr,"Argument Usage: --channels N(number>0)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage: --channels N(number>0)\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--s_quality") == 0) {
- if(i+1<argc){
- int num=atoi(argv[i+1]);
- if((num>=-1)&&(num<=10))
- arg_return->s_quality=num;
- else{
- fprintf(stderr,"Argument Usage:"
- " --s_quality n(number -1 to 10)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage:"
- " --s_quality n(number -1 to 10)\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--device") == 0) {
- if(i+1<argc){
- free(arg_return->device);
- arg_return->device=malloc(strlen(argv[i+1])+1);
- strcpy(arg_return->device,argv[i+1]);
- }
- else{
- fprintf(stderr,"Argument Usage: -device SOUND_DEVICE\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--workdir") == 0) {
- if(i+1<argc){
- free(arg_return->workdir);
- arg_return->workdir=malloc(strlen(argv[i+1])+1);
- strcpy(arg_return->workdir,argv[i+1]);
- }
- else{
- fprintf(stderr,"Argument Usage: --workdir DIR\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--pause-shortcut") == 0) {
- if(i+1<argc){
- free(arg_return->pause_shortcut);
- arg_return->pause_shortcut=malloc(strlen(argv[i+1])+1);
- strcpy(arg_return->pause_shortcut,argv[i+1]);
- }
- else{
- fprintf(stderr,"Argument Usage: --pause-shortcut MOD+KEY\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--stop-shortcut") == 0) {
- if(i+1<argc){
- free(arg_return->stop_shortcut);
- arg_return->stop_shortcut=malloc(strlen(argv[i+1])+1);
- strcpy(arg_return->stop_shortcut,argv[i+1]);
- }
- else{
- fprintf(stderr,"Argument Usage: --stop-shortcut MOD+KEY\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--buffer-size") == 0) {
- if(i+1<argc){
- int num=atoi(argv[i+1]);
- if(num>0)
- arg_return->buffsize=num;
- else{
- fprintf(stderr,"Argument Usage:"
- " --buffer-size N(number>0)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage: --buffer-size N(number>0)\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--use-jack") == 0) {
- if(i+1<argc){
-#ifdef HAVE_LIBJACK
- int k=i+1;
- arg_return->jack_nports=0;
- while((k<argc)&&(argv[k][0]!='-')&&k-i-1<RMD_MAX_JACK_PORTS){
+ break;
+
+ case RMD_ARG_USE_JACK:
+ {
+ arg_return->jack_nports = 0;
+
+ while (arg) {
+
arg_return->jack_nports++;
- arg_return->jack_port_names[k-i-1]=malloc(strlen(argv[k])+1);
- strcpy(arg_return->jack_port_names[k-i-1],argv[k]);
+ arg_return->jack_port_names[arg_return->jack_nports - 1] = malloc(strlen(arg) + 1);
+ strcpy(arg_return->jack_port_names[arg_return->jack_nports - 1], arg);
- arg_return->use_jack=1;
+ arg = poptGetOptArg(popt_context);
+ }
- k++;
+ if (arg_return->jack_nports > 0)
+ {
+ arg_return->use_jack = 1;
}
+ else
+ {
+ fprintf(stderr,
+ "Argument Usage: --use-jack port1 port2... portn\n");
+ success = FALSE;
+ }
- i+=arg_return->jack_nports;
-
- if (arg_return->jack_nports==0) {
- fprintf(stderr,"Argument Usage: --use-jack port1"
- " port2... portn\n");
- return FALSE;
+ if (RMD_USE_JACK_EXTRA_FLAG == POPT_ARGFLAG_DOC_HIDDEN)
+ {
+ fprintf(stderr,
+ "Warning, will ignore --use-jack flags, no libjack support in build.\n");
}
-#else
- fprintf(stderr,"recordMyDesktop is not compiled"
- " with Jack support!\n");
- return FALSE;
-#endif
- }
- else{
- fprintf(stderr,"Argument Usage: --use-jack port1"
- " port2... portn\n");
- return FALSE;
- }
+ }
+
+ default:
+ break;
}
- else if (strcmp(argv[i], "--ring-buffer-size") == 0) {
- if(i+1<argc){
- float num=atof(argv[i+1]);
- if(num>0.0)
- arg_return->jack_ringbuffer_secs=num;
- else{
- fprintf(stderr,"Argument Usage: --ring-buffer-size"
- " N(floating point number>0.0)\n");
- return FALSE;
- }
- }
- else{
- fprintf(stderr,"Argument Usage: --ring-buffer-size"
- " N(floating point number>0.0)\n");
- return FALSE;
- }
- i++;
- }
- else if (strcmp(argv[i], "--rescue") == 0) {
- if(i+1<argc){
- arg_return->rescue_path = argv[i + 1];
- }
- else{
- fprintf(stderr,"Argument Usage: --rescue path_to_data\n");
- return FALSE;
- }
- i++;
- }
- else if(!strcmp(argv[i],"--no-sound"))
- arg_return->nosound=1;
- else if(!strcmp(argv[i],"--no-shared")){
- arg_return->noshared=1;
- }
- else if(!strcmp(argv[i],"--full-shots")){
- arg_return->full_shots=1;
- }
- else if(!strcmp(argv[i],"--no-frame")){
- arg_return->noframe=1;
- }
- else if(!strcmp(argv[i],"--follow-mouse")){
- arg_return->full_shots=1;
- arg_return->follow_mouse=1;
- }
- else if(!strcmp(argv[i],"--no-encode"))
- arg_return->no_encode=1;
- else if(!strcmp(argv[i],"--quick-subsampling")){
- arg_return->no_quick_subsample=0;
- }
- else if(!strcmp(argv[i],"--on-the-fly-encoding")){
- arg_return->encOnTheFly=1;
- }
- else if(!strcmp(argv[i],"--overwrite"))
- arg_return->overwrite=1;
- else if(!strcmp(argv[i],"--no-wm-check"))
- arg_return->nowmcheck=1;
- else if(!strcmp(argv[i],"--compress-cache")){
- arg_return->zerocompression=0;
- }
- else if(!strcmp(argv[i],"--help")||!strcmp(argv[i],"-h")){
- fprintf(stderr,"%s",usage);
- exit(0);
- }
- else if(!strcmp(argv[i],"--version")){
- fprintf(stderr,"recordMyDesktop v%s\n\n",VERSION);
- exit(0);
- }
- else if(!strcmp(argv[i],"--print-config")){
- rmdPrintConfig();
- exit(0);
- }
- else{
- fprintf(stderr,"\n\tError parsing arguments.\n\t"
- "Type --help or -h for usage.\n\n");
- return FALSE;
- }
}
+
+ // Parsing is complete, perform final adjustments
+ if (no_cursor)
+ arg_return->xfixes_cursor = FALSE;
+
+ if (quick_subsampling)
+ arg_return->no_quick_subsample = FALSE;
+
+ if (compress_cache)
+ arg_return->zerocompression = FALSE;
+
+ if (arg_return->follow_mouse)
+ arg_return->full_shots = TRUE;
+
+ if (!arg_return->filename)
+ arg_return->filename = strdup(poptGetArg(popt_context));
+
+ // Make sure argument ranges are valid
+ success = success && rmdValidateArguments(arg_return);
+
+ // Clean up
+ poptFreeContext(popt_context);
- return TRUE;
+ return success;
}
+
+static boolean rmdValidateArguments(const ProgArgs *args)
+{
+ static
+ boolean success = TRUE;
+
+ if (args->x < 0) {
+ fprintf(stdout, "-x must not be less than 0.\n");
+ success = FALSE;
+ }
+ if (args->y < 0) {
+ fprintf(stdout, "-y must not be less than 0.\n");
+ success = FALSE;
+ }
+ if (args->width < 0) {
+ fprintf(stdout, "--width must be larger than 0.\n");
+ success = FALSE;
+ }
+ if (args->height < 0) {
+ fprintf(stdout, "--height must be larger than 0.\n");
+ success = FALSE;
+ }
+ if (args->fps <= 0) {
+ fprintf(stdout, "--fps must be larger than 0.\n");
+ success = FALSE;
+ }
+ if (args->v_quality < 0 || args->v_quality > 63) {
+ fprintf(stdout, "--v_quality must be within the inclusive range [0-63].\n");
+ success = FALSE;
+ }
+ if (args->v_bitrate < 45000 || args->v_quality > 2000000) {
+ fprintf(stdout, "--v_bitrate must be within the inclusive range [45000-2000000].\n");
+ success = FALSE;
+ }
+ if (args->frequency <= 0) {
+ fprintf(stdout, "--frequency must be larger than 0.\n");
+ success = FALSE;
+ }
+ if (args->channels <= 0) {
+ fprintf(stdout, "--channels must be larger than 0.\n");
+ success = FALSE;
+ }
+ if (args->buffsize <= 0) {
+ fprintf(stdout, "--buffer-size must be larger than 0.\n");
+ success = FALSE;
+ }
+ if (args->jack_ringbuffer_secs <= 0) {
+ fprintf(stdout, "--jack-buffer-size must be larger than 0.\n");
+ success = FALSE;
+ }
+
+ return success;
+}
+
+static void rmdPrintAndExit(poptContext con,
+ enum poptCallbackReason reason,
+ const struct poptOption *opt,
+ const char *arg,
+ const void *data)
+{
+ if (strcmp(opt->longName, "version") == 0) {
+ fprintf(stderr,"recordMyDesktop v%s\n\n",VERSION);
+ }
+ else if (strcmp(opt->longName, "help") == 0) {
+ poptPrintHelp(con, stdout, 0);
+ fprintf(stdout,
+ "\n"
+ "\tIf no other options are specified, filename can be given without the -o switch.\n"
+ "\n"
+ "\n");
+ }
+ else if (strcmp(opt->longName, "print-config") == 0) {
+ fprintf(stdout,
+ "\n"
+ "recordMyDesktop was compiled with the following options:\n"
+ "\n"
+ "Jack:\t\t\t" RMD_LIBJACK_STATUS "\n"
+ "Default Audio Backend:\t" RMD_LIBASOUND_STATUS "\n"
+ "\n"
+ "\n");
+ }
+
+ exit(0);
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-11 12:31:41
|
Revision: 594
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=594&view=rev
Author: enselic
Date: 2009-01-11 11:41:58 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
src/rmd_parseargs.c: Make sure all options have longarg variants as
this makes the --help output look nicer.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_parseargs.c
Modified: trunk/recordmydesktop/src/rmd_parseargs.c
===================================================================
--- trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 11:39:18 UTC (rev 593)
+++ trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-11 11:41:58 UTC (rev 594)
@@ -108,12 +108,12 @@
"Display to connect to.",
"DISPLAY" },
- { NULL, 'x',
+ { "x", 'x',
POPT_ARG_INT, &arg_return->x, 0,
"Offset in x direction.",
"N>=0" },
- { NULL, 'y',
+ { "x", 'y',
POPT_ARG_INT, &arg_return->y, 0,
"Offset in y direction.",
"N>=0" },
@@ -277,7 +277,7 @@
"If there is already a file with the same name, delete it (default is to add a number postfix to the new one).",
NULL },
- { NULL, 'o',
+ { "output", 'o',
POPT_ARG_STRING, &arg_return->filename, 0,
"Name of recorded video(default out.ogv).",
"filename" },
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-11 11:08:31
|
Revision: 592
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=592&view=rev
Author: enselic
Date: 2009-01-11 11:08:25 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
src/rmd_get_frame.c: Work around issue with underflow in
rmdBlocksFromList(). I call this a "workaround" because the whole code
base needs to stop using unsigned so much IMO.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_get_frame.c
Modified: trunk/recordmydesktop/src/rmd_get_frame.c
===================================================================
--- trunk/recordmydesktop/src/rmd_get_frame.c 2009-01-11 10:27:57 UTC (rev 591)
+++ trunk/recordmydesktop/src/rmd_get_frame.c 2009-01-11 11:08:25 UTC (rev 592)
@@ -319,13 +319,13 @@
unsigned int blocknum_y) {
RectArea *temp;
- unsigned int i,
- j,
- blockno,
- row_start,
- row_end,
- column_start,
- column_end;
+ int i,
+ j,
+ blockno,
+ row_start,
+ row_end,
+ column_start,
+ column_end;
temp = *root;
@@ -335,10 +335,10 @@
while (temp != NULL) {
- column_start = (temp->rect.x - x_offset) / Y_UNIT_WIDTH;
- column_end = (temp->rect.x + (temp->rect.width - 1) - x_offset) / Y_UNIT_WIDTH;
- row_start = (temp->rect.y - y_offset) / Y_UNIT_WIDTH;
- row_end = (temp->rect.y + (temp->rect.height - 1) - y_offset) / Y_UNIT_WIDTH;
+ column_start = ((int)(temp->rect.x - x_offset)) / Y_UNIT_WIDTH;
+ column_end = ((int)(temp->rect.x + (temp->rect.width - 1) - x_offset)) / Y_UNIT_WIDTH;
+ row_start = ((int)(temp->rect.y - y_offset)) / Y_UNIT_WIDTH;
+ row_end = ((int)(temp->rect.y + (temp->rect.height - 1) - y_offset)) / Y_UNIT_WIDTH;
for (i = row_start; i < row_end + 1; i++) {
for (j = column_start; j < column_end + 1; j++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-11 10:28:01
|
Revision: 591
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=591&view=rev
Author: enselic
Date: 2009-01-11 10:27:57 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
src/rmd_types.h: Make ProgArgs::width,height signed as that is what
they are parsed as.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_types.h
Modified: trunk/recordmydesktop/src/rmd_types.h
===================================================================
--- trunk/recordmydesktop/src/rmd_types.h 2009-01-10 20:00:06 UTC (rev 590)
+++ trunk/recordmydesktop/src/rmd_types.h 2009-01-11 10:27:57 UTC (rev 591)
@@ -116,7 +116,7 @@
Window windowid; //window to record(default root)
char *display; //display to connect(default :0)
int x,y; //x,y offset(default 0,0)
- unsigned int width,height; //defaults to window width and height
+ int width,height; //defaults to window width and height
char *filename; //output file(default out.[ogg|*])
int cursor_color; //black or white=>1 or 0
int have_dummy_cursor; //disable/enable drawing of the dummy cursor
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-10 20:00:14
|
Revision: 590
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=590&view=rev
Author: enselic
Date: 2009-01-10 20:00:06 +0000 (Sat, 10 Jan 2009)
Log Message:
-----------
src/*.c: Namescape all functions for consistency and general codebase
sanity (previously only a few rmd functions were namespaced).
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd.c
trunk/recordmydesktop/src/rmd_cache.c
trunk/recordmydesktop/src/rmd_cache.h
trunk/recordmydesktop/src/rmd_cache_audio.c
trunk/recordmydesktop/src/rmd_cache_audio.h
trunk/recordmydesktop/src/rmd_cache_frame.c
trunk/recordmydesktop/src/rmd_cache_frame.h
trunk/recordmydesktop/src/rmd_capture_sound.c
trunk/recordmydesktop/src/rmd_capture_sound.h
trunk/recordmydesktop/src/rmd_encode_cache.c
trunk/recordmydesktop/src/rmd_encode_cache.h
trunk/recordmydesktop/src/rmd_encode_image_buffer.c
trunk/recordmydesktop/src/rmd_encode_image_buffer.h
trunk/recordmydesktop/src/rmd_encode_sound_buffer.c
trunk/recordmydesktop/src/rmd_encode_sound_buffer.h
trunk/recordmydesktop/src/rmd_flush_to_ogg.c
trunk/recordmydesktop/src/rmd_flush_to_ogg.h
trunk/recordmydesktop/src/rmd_get_frame.c
trunk/recordmydesktop/src/rmd_get_frame.h
trunk/recordmydesktop/src/rmd_getzpixmap.c
trunk/recordmydesktop/src/rmd_getzpixmap.h
trunk/recordmydesktop/src/rmd_init_encoder.c
trunk/recordmydesktop/src/rmd_init_encoder.h
trunk/recordmydesktop/src/rmd_initialize_data.c
trunk/recordmydesktop/src/rmd_initialize_data.h
trunk/recordmydesktop/src/rmd_jack.c
trunk/recordmydesktop/src/rmd_jack.h
trunk/recordmydesktop/src/rmd_load_cache.c
trunk/recordmydesktop/src/rmd_load_cache.h
trunk/recordmydesktop/src/rmd_make_dummy_pointer.c
trunk/recordmydesktop/src/rmd_make_dummy_pointer.h
trunk/recordmydesktop/src/rmd_opendev.c
trunk/recordmydesktop/src/rmd_opendev.h
trunk/recordmydesktop/src/rmd_parseargs.c
trunk/recordmydesktop/src/rmd_parseargs.h
trunk/recordmydesktop/src/rmd_poll_events.c
trunk/recordmydesktop/src/rmd_poll_events.h
trunk/recordmydesktop/src/rmd_queryextensions.c
trunk/recordmydesktop/src/rmd_queryextensions.h
trunk/recordmydesktop/src/rmd_rectinsert.c
trunk/recordmydesktop/src/rmd_rectinsert.h
trunk/recordmydesktop/src/rmd_register_callbacks.c
trunk/recordmydesktop/src/rmd_register_callbacks.h
trunk/recordmydesktop/src/rmd_rescue.c
trunk/recordmydesktop/src/rmd_setbrwindow.c
trunk/recordmydesktop/src/rmd_setbrwindow.h
trunk/recordmydesktop/src/rmd_shortcuts.c
trunk/recordmydesktop/src/rmd_shortcuts.h
trunk/recordmydesktop/src/rmd_specsfile.c
trunk/recordmydesktop/src/rmd_specsfile.h
trunk/recordmydesktop/src/rmd_threads.c
trunk/recordmydesktop/src/rmd_update_image.c
trunk/recordmydesktop/src/rmd_update_image.h
trunk/recordmydesktop/src/rmd_yuv_utils.c
trunk/recordmydesktop/src/rmd_yuv_utils.h
trunk/recordmydesktop/src/test-rectinsert.c
Modified: trunk/recordmydesktop/src/rmd.c
===================================================================
--- trunk/recordmydesktop/src/rmd.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -49,9 +49,9 @@
ProgData pdata;
int exit_status = 0;
- SetupDefaultArgs(&pdata.args);
+ rmdSetupDefaultArgs(&pdata.args);
- if (!ParseArgs(argc, argv, &pdata.args)) {
+ if (!rmdParseArgs(argc, argv, &pdata.args)) {
exit(1);
}
if (pdata.args.rescue_path != NULL) {
@@ -100,7 +100,7 @@
" color depth modes are currently supported.\n");
exit(10);
}
- if (!SetBRWindow(pdata.dpy, &pdata.brwin, &pdata.specs, &pdata.args))
+ if (!rmdSetBRWindow(pdata.dpy, &pdata.brwin, &pdata.specs, &pdata.args))
exit(11);
if( !pdata.args.nowmcheck &&
@@ -116,38 +116,38 @@
}
- QueryExtensions(pdata.dpy,
- &pdata.args,
- &pdata.damage_event,
- &pdata.damage_error,
- &pdata.shm_opcode);
+ rmdQueryExtensions(pdata.dpy,
+ &pdata.args,
+ &pdata.damage_event,
+ &pdata.damage_error,
+ &pdata.shm_opcode);
- if((exit_status=InitializeData(&pdata,&enc_data,&cache_data))==0){
+ if((exit_status=rmdInitializeData(&pdata,&enc_data,&cache_data))==0){
if(!strcmp(pdata.args.pause_shortcut,
pdata.args.stop_shortcut)||
- RegisterShortcut(pdata.dpy,
- pdata.specs.root,
- pdata.args.pause_shortcut,
- &(pdata.pause_key)) ||
- RegisterShortcut(pdata.dpy,
- pdata.specs.root,
- pdata.args.stop_shortcut,
- &(pdata.stop_key))){
+ rmdRegisterShortcut(pdata.dpy,
+ pdata.specs.root,
+ pdata.args.pause_shortcut,
+ &(pdata.pause_key)) ||
+ rmdRegisterShortcut(pdata.dpy,
+ pdata.specs.root,
+ pdata.args.stop_shortcut,
+ &(pdata.stop_key))){
fprintf(stderr,"Invalid shortcut,"
" or shortcuts are the same!\n\n"
"Using defaults.\n");
- RegisterShortcut(pdata.dpy,
- pdata.specs.root,
- "Control+Mod1+p",
- &(pdata.pause_key));
- RegisterShortcut(pdata.dpy,
- pdata.specs.root,
- "Control+Mod1+s",
- &(pdata.stop_key));
+ rmdRegisterShortcut(pdata.dpy,
+ pdata.specs.root,
+ "Control+Mod1+p",
+ &(pdata.pause_key));
+ rmdRegisterShortcut(pdata.dpy,
+ pdata.specs.root,
+ "Control+Mod1+s",
+ &(pdata.stop_key));
}
//this is where the capturing happens.
@@ -159,10 +159,10 @@
//encode and then cleanup cache
if(!pdata.args.encOnTheFly && !pdata.args.no_encode){
if (!pdata.aborted) {
- EncodeCache(&pdata);
+ rmdEncodeCache(&pdata);
}
fprintf(stderr,"Cleanning up cache...\n");
- if(PurgeCache(pdata.cache_data,!pdata.args.nosound))
+ if(rmdPurgeCache(pdata.cache_data,!pdata.args.nosound))
fprintf(stderr,"Some error occured "
"while cleaning up cache!\n");
fprintf(stderr,"Done!!!\n");
@@ -184,7 +184,7 @@
fprintf(stderr,"Goodbye!\n");
- CleanUp();
+ rmdCleanUp();
}
}
Modified: trunk/recordmydesktop/src/rmd_cache.c
===================================================================
--- trunk/recordmydesktop/src/rmd_cache.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_cache.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -46,7 +46,7 @@
* \n number to be used as a postfix
*
*/
-static void CacheFileN(char *name, char **newname, int n) { // Nth cache file
+static void rmdCacheFileN(char *name, char **newname, int n) { // Nth cache file
char numbuf[8];
strcpy(*newname,name);
strcat(*newname,".");
@@ -54,9 +54,9 @@
strcat(*newname,numbuf);
}
-int SwapCacheFilesWrite(char *name,int n,gzFile **fp,FILE **ucfp){
+int rmdSwapCacheFilesWrite(char *name,int n,gzFile **fp,FILE **ucfp){
char *newname=malloc(strlen(name)+10);
- CacheFileN(name,&newname,n);
+ rmdCacheFileN(name,&newname,n);
if(*fp==NULL){
fflush(*ucfp);
fclose(*ucfp);
@@ -71,9 +71,9 @@
return ((*fp==NULL)&&(*ucfp==NULL));
}
-int SwapCacheFilesRead(char *name,int n,gzFile **fp,FILE **ucfp){
+int rmdSwapCacheFilesRead(char *name,int n,gzFile **fp,FILE **ucfp){
char *newname=malloc(strlen(name)+10);
- CacheFileN(name,&newname,n);
+ rmdCacheFileN(name,&newname,n);
if(*fp==NULL){
fclose(*ucfp);
*ucfp=fopen(newname,"rb");
@@ -87,7 +87,7 @@
return ((*fp==NULL)&&(*ucfp==NULL));
}
-int PurgeCache(CacheData *cache_data_t,int sound){
+int rmdPurgeCache(CacheData *cache_data_t,int sound){
struct stat buff;
char *fname;
fname=malloc(strlen(cache_data_t->imgdata)+10);
@@ -101,7 +101,7 @@
cache_data_t->imgdata);
exit_value=1;
}
- CacheFileN(cache_data_t->imgdata,&fname,nth_cache);
+ rmdCacheFileN(cache_data_t->imgdata,&fname,nth_cache);
nth_cache++;
}
free(fname);
@@ -125,9 +125,9 @@
return exit_value;
}
-void InitCacheData(ProgData *pdata,
- EncData *enc_data_t,
- CacheData *cache_data_t){
+void rmdInitCacheData(ProgData *pdata,
+ EncData *enc_data_t,
+ CacheData *cache_data_t){
int width,height,offset_x,offset_y,pid;
char pidbuf[8];
@@ -215,7 +215,7 @@
exit(13);
}
}
- if(WriteSpecsFile(pdata)){
+ if(rmdWriteSpecsFile(pdata)){
fprintf(stderr,"Could not write specsfile %s !!!\n",
cache_data_t->specsfile);
exit(13);
Modified: trunk/recordmydesktop/src/rmd_cache.h
===================================================================
--- trunk/recordmydesktop/src/rmd_cache.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_cache.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -49,7 +49,7 @@
*
* \returns 0 on Success 1 on Failure
*/
-int SwapCacheFilesWrite(char *name,int n,gzFile **fp,FILE **ucfp);
+int rmdSwapCacheFilesWrite(char *name,int n,gzFile **fp,FILE **ucfp);
/**
* Change file pointer to a new file while reading
@@ -65,7 +65,7 @@
*
* \returns 0 on Success 1 on Failure
*/
-int SwapCacheFilesRead(char *name,int n,gzFile **fp,FILE **ucfp);
+int rmdSwapCacheFilesRead(char *name,int n,gzFile **fp,FILE **ucfp);
/**
* Delete all cache files
@@ -74,7 +74,7 @@
*
* \returns 0 if all files and folders where deleted, 1 otherwise
*/
-int PurgeCache(CacheData *cache_data_t,int sound);
+int rmdPurgeCache(CacheData *cache_data_t,int sound);
/**
* Initializes paths and everything else needed to start caching
@@ -86,9 +86,9 @@
* \param cache_data_t Caching options
*
*/
-void InitCacheData(ProgData *pdata,
- EncData *enc_data_t,
- CacheData *cache_data_t);
+void rmdInitCacheData(ProgData *pdata,
+ EncData *enc_data_t,
+ CacheData *cache_data_t);
#endif
Modified: trunk/recordmydesktop/src/rmd_cache_audio.c
===================================================================
--- trunk/recordmydesktop/src/rmd_cache_audio.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_cache_audio.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -38,7 +38,7 @@
-void *CacheSoundBuffer(ProgData *pdata){
+void *rmdCacheSoundBuffer(ProgData *pdata){
//We are simply going to throw sound on the disk.
//It's sound is tiny compared to that of image, so
//compressing would reducethe overall size by only an
Modified: trunk/recordmydesktop/src/rmd_cache_audio.h
===================================================================
--- trunk/recordmydesktop/src/rmd_cache_audio.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_cache_audio.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -36,7 +36,7 @@
* \param pdata ProgData struct containing all program data
*
*/
-void *CacheSoundBuffer(ProgData *pdata);
+void *rmdCacheSoundBuffer(ProgData *pdata);
#endif
Modified: trunk/recordmydesktop/src/rmd_cache_frame.c
===================================================================
--- trunk/recordmydesktop/src/rmd_cache_frame.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_cache_frame.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -43,14 +43,14 @@
#define CACHE_FILE_SIZE_LIMIT (500 * 1024 * 1024)
-static int FlushBlock(unsigned char *buf,
- int blockno,
- int width,
- int height,
- int blockwidth,
- gzFile *fp,
- FILE *ucfp,
- int flush) {
+static int rmdFlushBlock(unsigned char *buf,
+ int blockno,
+ int width,
+ int height,
+ int blockwidth,
+ gzFile *fp,
+ FILE *ucfp,
+ int flush) {
int j,i,
bytes_written=0,
block_i=(!blockwidth)?0:(blockno/(width/blockwidth)),//place on the grid
@@ -83,7 +83,7 @@
return bytes_written;
}
-void *CacheImageBuffer(ProgData *pdata){
+void *rmdCacheImageBuffer(ProgData *pdata){
gzFile *fp=NULL;
FILE *ucfp=NULL;
@@ -206,42 +206,42 @@
//flush the blocks for each buffer
if(ynum){
for(j=0;j<ynum;j++)
- nbytes+=FlushBlock( pdata->enc_data->yuv.y,y_short_blocks[j],
- pdata->enc_data->yuv.y_width,
- pdata->enc_data->yuv.y_height,
- Y_UNIT_WIDTH,
- fp,
- ucfp,
- 0);
+ nbytes+=rmdFlushBlock(pdata->enc_data->yuv.y,y_short_blocks[j],
+ pdata->enc_data->yuv.y_width,
+ pdata->enc_data->yuv.y_height,
+ Y_UNIT_WIDTH,
+ fp,
+ ucfp,
+ 0);
}
if(unum){
for(j=0;j<unum;j++)
- nbytes+=FlushBlock( pdata->enc_data->yuv.u,u_short_blocks[j],
- pdata->enc_data->yuv.uv_width,
- pdata->enc_data->yuv.uv_height,
- UV_UNIT_WIDTH,
- fp,
- ucfp,
- 0);
+ nbytes+=rmdFlushBlock(pdata->enc_data->yuv.u,u_short_blocks[j],
+ pdata->enc_data->yuv.uv_width,
+ pdata->enc_data->yuv.uv_height,
+ UV_UNIT_WIDTH,
+ fp,
+ ucfp,
+ 0);
}
if(vnum){
for(j=0;j<vnum;j++)
- nbytes+=FlushBlock( pdata->enc_data->yuv.v,v_short_blocks[j],
- pdata->enc_data->yuv.uv_width,
- pdata->enc_data->yuv.uv_height,
- UV_UNIT_WIDTH,
- fp,
- ucfp,
- 0);
+ nbytes+=rmdFlushBlock(pdata->enc_data->yuv.v,v_short_blocks[j],
+ pdata->enc_data->yuv.uv_width,
+ pdata->enc_data->yuv.uv_height,
+ UV_UNIT_WIDTH,
+ fp,
+ ucfp,
+ 0);
}
//release main buffer
pthread_mutex_unlock(&pdata->yuv_mutex);
- nbytes+=FlushBlock(NULL,0,0,0,0,fp,ucfp,1);
+ nbytes+=rmdFlushBlock(NULL,0,0,0,0,fp,ucfp,1);
/**@________________@**/
pdata->avd+=pdata->frametime;
if(nbytes>CACHE_FILE_SIZE_LIMIT){
- if(SwapCacheFilesWrite(pdata->cache_data->imgdata,
+ if(rmdSwapCacheFilesWrite(pdata->cache_data->imgdata,
nth_cache,&fp,&ucfp)){
fprintf(stderr,"New cache file could not be created.\n"
"Ending recording...\n");
Modified: trunk/recordmydesktop/src/rmd_cache_frame.h
===================================================================
--- trunk/recordmydesktop/src/rmd_cache_frame.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_cache_frame.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -37,7 +37,7 @@
* \param pdata ProgData struct containing all program data
*
*/
-void *CacheImageBuffer(ProgData *pdata);
+void *rmdCacheImageBuffer(ProgData *pdata);
#endif
Modified: trunk/recordmydesktop/src/rmd_capture_sound.c
===================================================================
--- trunk/recordmydesktop/src/rmd_capture_sound.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_capture_sound.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -36,7 +36,7 @@
#include <errno.h>
-void *CaptureSound(ProgData *pdata){
+void *rmdCaptureSound(ProgData *pdata){
#ifdef HAVE_LIBASOUND
int frames=pdata->periodsize;
@@ -62,15 +62,15 @@
pthread_cond_wait(&pdata->pause_cond, &pdata->pause_mutex);
pthread_mutex_unlock(&pdata->pause_mutex);
pdata->sound_handle=
- OpenDev(pdata->args.device,
- &pdata->args.channels,
- &pdata->args.frequency,
- &pdata->args.buffsize,
- NULL,
- NULL,
- NULL//let's hope that the device capabilities
- //didn't magically change
- );
+ rmdOpenDev(pdata->args.device,
+ &pdata->args.channels,
+ &pdata->args.frequency,
+ &pdata->args.buffsize,
+ NULL,
+ NULL,
+ NULL//let's hope that the device capabilities
+ //didn't magically change
+ );
if(pdata->sound_handle==NULL){
fprintf(stderr,"Couldn't reopen sound device.Exiting\n");
pdata->running = FALSE;
@@ -84,9 +84,9 @@
pthread_cond_wait(&pdata->pause_cond, &pdata->pause_mutex);
pthread_mutex_unlock(&pdata->pause_mutex);
pdata->sound_handle=
- OpenDev(pdata->args.device,
- pdata->args.channels,
- pdata->args.frequency);
+ rmdOpenDev(pdata->args.device,
+ pdata->args.channels,
+ pdata->args.frequency);
if(pdata->sound_handle<0){
fprintf(stderr,"Couldn't reopen sound device.Exiting\n");
pdata->running = FALSE;
Modified: trunk/recordmydesktop/src/rmd_capture_sound.h
===================================================================
--- trunk/recordmydesktop/src/rmd_capture_sound.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_capture_sound.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -36,7 +36,7 @@
*
* \param pdata ProgData struct containing all program data
*/
-void *CaptureSound(ProgData *pdata);
+void *rmdCaptureSound(ProgData *pdata);
#endif
Modified: trunk/recordmydesktop/src/rmd_encode_cache.c
===================================================================
--- trunk/recordmydesktop/src/rmd_encode_cache.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_encode_cache.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -39,7 +39,7 @@
-void EncodeCache(ProgData *pdata){
+void rmdEncodeCache(ProgData *pdata){
pthread_t flush_to_ogg_t,
load_cache_t;
fprintf(stderr,"STATE:ENCODING\n");fflush(stderr);
@@ -49,7 +49,7 @@
"any portion of the video, which is already encoded won't be deleted).\n"
"Please wait...\n");
pdata->running = TRUE;
- InitEncoder(pdata,pdata->enc_data,1);
+ rmdInitEncoder(pdata,pdata->enc_data,1);
//load encoding and flushing threads
if(!pdata->args.nosound){
//before we start loading again
@@ -59,10 +59,10 @@
pdata->sound_buffer=pdata->sound_buffer->next;
}
}
- pthread_create(&flush_to_ogg_t,NULL,(void *)FlushToOgg,(void *)pdata);
+ pthread_create(&flush_to_ogg_t,NULL,(void *)rmdFlushToOgg,(void *)pdata);
//start loading image and audio
- pthread_create(&load_cache_t,NULL,(void *)LoadCache,(void *)pdata);
+ pthread_create(&load_cache_t,NULL,(void *)rmdLoadCache,(void *)pdata);
//join and finish
pthread_join(load_cache_t,NULL);
Modified: trunk/recordmydesktop/src/rmd_encode_cache.h
===================================================================
--- trunk/recordmydesktop/src/rmd_encode_cache.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_encode_cache.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -35,7 +35,7 @@
* ogg stream.
* \param pdata ProgData struct containing all program data
*/
-void EncodeCache(ProgData *pdata);
+void rmdEncodeCache(ProgData *pdata);
#endif
Modified: trunk/recordmydesktop/src/rmd_encode_image_buffer.c
===================================================================
--- trunk/recordmydesktop/src/rmd_encode_image_buffer.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_encode_image_buffer.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -32,7 +32,7 @@
#include <errno.h>
-void *EncodeImageBuffer(ProgData *pdata){
+void *rmdEncodeImageBuffer(ProgData *pdata){
pdata->th_encoding_clean=0;
while(pdata->running){
pdata->th_enc_thread_waiting=1;
@@ -77,7 +77,7 @@
//this function is meant to be called normally
//not through a thread of it's own
-void SyncEncodeImageBuffer(ProgData *pdata){
+void rmdSyncEncodeImageBuffer(ProgData *pdata){
if(theora_encode_YUVin(&pdata->enc_data->m_th_st,
&pdata->enc_data->yuv)){
fprintf(stderr,"Encoder not ready!\n");
Modified: trunk/recordmydesktop/src/rmd_encode_image_buffer.h
===================================================================
--- trunk/recordmydesktop/src/rmd_encode_image_buffer.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_encode_image_buffer.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -35,16 +35,16 @@
* the ogg stream.
* \param pdata ProgData struct containing all program data
*/
-void *EncodeImageBuffer(ProgData *pdata);
+void *rmdEncodeImageBuffer(ProgData *pdata);
/**
-* As EncodeImageBuffer, only with the assumption that
+* As rmdEncodeImageBuffer, only with the assumption that
* this is not a thread on it's own
*
* \param pdata ProgData struct containing all program data
*
*/
-void SyncEncodeImageBuffer(ProgData *pdata);
+void rmdSyncEncodeImageBuffer(ProgData *pdata);
#endif
Modified: trunk/recordmydesktop/src/rmd_encode_sound_buffer.c
===================================================================
--- trunk/recordmydesktop/src/rmd_encode_sound_buffer.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_encode_sound_buffer.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -36,7 +36,7 @@
#include <errno.h>
-void *EncodeSoundBuffer(ProgData *pdata){
+void *rmdEncodeSoundBuffer(ProgData *pdata){
int sampread=pdata->periodsize;
#ifdef HAVE_LIBJACK
void *jackbuf=NULL;
@@ -143,7 +143,7 @@
pthread_exit(&errno);
}
-void SyncEncodeSoundBuffer(ProgData *pdata,signed char *buff){
+void rmdSyncEncodeSoundBuffer(ProgData *pdata,signed char *buff){
float **vorbis_buffer;
int count=0,i,j;
int sampread=(buff!=NULL)?pdata->periodsize:0;
Modified: trunk/recordmydesktop/src/rmd_encode_sound_buffer.h
===================================================================
--- trunk/recordmydesktop/src/rmd_encode_sound_buffer.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_encode_sound_buffer.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -36,16 +36,16 @@
*
* \param pdata ProgData struct containing all program data
*/
-void *EncodeSoundBuffer(ProgData *pdata);
+void *rmdEncodeSoundBuffer(ProgData *pdata);
/**
-* As EncodeSoundBuffer, only with the assumption that
+* As rmdEncodeSoundBuffer, only with the assumption that
* this is not a thread on it's own
*
* \param pdata ProgData struct containing all program data
*
*/
-void SyncEncodeSoundBuffer(ProgData *pdata,signed char *buff);
+void rmdSyncEncodeSoundBuffer(ProgData *pdata,signed char *buff);
#endif
Modified: trunk/recordmydesktop/src/rmd_flush_to_ogg.c
===================================================================
--- trunk/recordmydesktop/src/rmd_flush_to_ogg.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_flush_to_ogg.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -69,7 +69,7 @@
free(pg->body);
}
-void *FlushToOgg(ProgData *pdata){
+void *rmdFlushToOgg(ProgData *pdata){
int videoflag=0,audioflag=0;
double video_bytesout=0,audio_bytesout=0;
ogg_page videopage,//owned by libogg
@@ -123,7 +123,7 @@
&pdata->theora_lib_mutex);
pthread_mutex_unlock(&pdata->theora_lib_mutex);
}
- SyncEncodeImageBuffer(pdata);
+ rmdSyncEncodeImageBuffer(pdata);
}
}
if(!pdata->args.nosound && !v_st_fin &&!audioflag){
@@ -143,7 +143,7 @@
&pdata->vorbis_lib_mutex);
pthread_mutex_unlock(&pdata->vorbis_lib_mutex);
}
- SyncEncodeSoundBuffer(pdata,NULL);
+ rmdSyncEncodeSoundBuffer(pdata,NULL);
}
}
}
Modified: trunk/recordmydesktop/src/rmd_flush_to_ogg.h
===================================================================
--- trunk/recordmydesktop/src/rmd_flush_to_ogg.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_flush_to_ogg.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -35,6 +35,6 @@
* flush them on the disk
* \param pdata ProgData struct containing all program data
*/
-void *FlushToOgg(ProgData *pdata);
+void *rmdFlushToOgg(ProgData *pdata);
#endif
Modified: trunk/recordmydesktop/src/rmd_get_frame.c
===================================================================
--- trunk/recordmydesktop/src/rmd_get_frame.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_get_frame.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -195,10 +195,10 @@
//besides taking the first screenshot, this functions primary purpose is to
//initialize the structures and memory.
-static int FirstFrame(ProgData *pdata,
- XImage **image,
- XShmSegmentInfo *shminfo,
- char **pxl_data) {
+static int rmdFirstFrame(ProgData *pdata,
+ XImage **image,
+ XShmSegmentInfo *shminfo,
+ char **pxl_data) {
if((pdata->args.noshared)){
@@ -215,12 +215,12 @@
8,
0);
XInitImage((*image));
- GetZPixmap(pdata->dpy,pdata->specs.root,
- (*image)->data,
- pdata->brwin.rrect.x,
- pdata->brwin.rrect.y,
- pdata->brwin.rrect.width,
- pdata->brwin.rrect.height);
+ rmdGetZPixmap(pdata->dpy,pdata->specs.root,
+ (*image)->data,
+ pdata->brwin.rrect.x,
+ pdata->brwin.rrect.y,
+ pdata->brwin.rrect.width,
+ pdata->brwin.rrect.height);
}
else{
(*image)=XShmCreateImage(pdata->dpy,
@@ -265,7 +265,7 @@
}
//make a deep copy
-static void BRWinCpy(BRWindow *target, BRWindow *source) {
+static void rmdBRWinCpy(BRWindow *target, BRWindow *source) {
target->rect.x=source->rect.x;
target->rect.y=source->rect.y;
@@ -282,11 +282,11 @@
//recenters the capture area to the mouse
//without exiting the display bounding box
-static void MoveCaptureArea(BRWindow *brwin,
- int cursor_x,
- int cursor_y,
- int width,
- int height) {
+static void rmdMoveCaptureArea(BRWindow *brwin,
+ int cursor_x,
+ int cursor_y,
+ int width,
+ int height) {
int t_x=0,t_y=0;
t_x=cursor_x-brwin->rrect.width/2;
@@ -312,11 +312,11 @@
*
* \param blocknum_y Height of image in blocks
*/
-static void BlocksFromList (RectArea **root,
- unsigned int x_offset,
- unsigned int y_offset,
- unsigned int blocknum_x,
- unsigned int blocknum_y) {
+static void rmdBlocksFromList (RectArea **root,
+ unsigned int x_offset,
+ unsigned int y_offset,
+ unsigned int blocknum_x,
+ unsigned int blocknum_y) {
RectArea *temp;
unsigned int i,
@@ -353,7 +353,7 @@
}
}
-void *GetFrame(ProgData *pdata){
+void *rmdGetFrame(ProgData *pdata){
int i=0,
blocknum_x=pdata->enc_data->yuv.y_width/Y_UNIT_WIDTH,
blocknum_y=pdata->enc_data->yuv.y_height/Y_UNIT_WIDTH;
@@ -375,7 +375,7 @@
img_sel=d_buff=pdata->args.full_shots;
- if((init_img1=FirstFrame(pdata,&image,&shminfo,&pxl_data)!=0)){
+ if((init_img1=rmdFirstFrame(pdata,&image,&shminfo,&pxl_data)!=0)){
if(pdata->args.encOnTheFly){
if(remove(pdata->args.filename)){
perror("Error while removing file:\n");
@@ -386,13 +386,13 @@
}
}
else{
- PurgeCache(pdata->cache_data,!pdata->args.nosound);
+ rmdPurgeCache(pdata->cache_data,!pdata->args.nosound);
}
exit(init_img1);
}
if(d_buff){
- if((init_img2=FirstFrame(pdata,&image_back,&shminfo_back,
- &pxl_data_back)!=0)){
+ if((init_img2=rmdFirstFrame(pdata,&image_back,&shminfo_back,
+ &pxl_data_back)!=0)){
if(pdata->args.encOnTheFly){
if(remove(pdata->args.filename)){
perror("Error while removing file:\n");
@@ -403,7 +403,7 @@
}
}
else{
- PurgeCache(pdata->cache_data,!pdata->args.nosound);
+ rmdPurgeCache(pdata->cache_data,!pdata->args.nosound);
}
exit(init_img2);
}
@@ -429,7 +429,7 @@
//This is the the place where we call XSelectInput
//and arrange so that we listen for damage on all
//windows
- InitEventsPolling(pdata);
+ rmdInitEventsPolling(pdata);
while(pdata->running){
@@ -443,20 +443,20 @@
if (pdata->paused) {
//this is necessary since event loop processes
//the shortcuts which will unpause the program
- EventLoop(pdata);
+ rmdEventLoop(pdata);
continue;
}
}
//read all events and construct list with damage
//events (if not full_shots)
- EventLoop(pdata);
+ rmdEventLoop(pdata);
//switch back and front buffers (full_shots only)
if(d_buff)
img_sel=(img_sel)?0:1;
pdata->capture_busy = TRUE;
- BRWinCpy(&temp_brwin,&pdata->brwin);
+ rmdBRWinCpy(&temp_brwin,&pdata->brwin);
if(pdata->args.xfixes_cursor ||
@@ -465,15 +465,15 @@
// Pointer sequence:
- // * Mark previous position as dirty with RectInsert()
+ // * Mark previous position as dirty with rmdRectInsert()
// * Update to new position
- // * Mark new position as dirty with RectInsert()
+ // * Mark new position as dirty with rmdRectInsert()
if (!pdata->args.full_shots &&
mouse_pos_temp.x >=0 &&
mouse_pos_temp.y >=0 &&
mouse_pos_temp.width > 0 &&
mouse_pos_temp.height > 0) {
- RectInsert(&pdata->rect_root,&mouse_pos_temp);
+ rmdRectInsert(&pdata->rect_root,&mouse_pos_temp);
}
if(pdata->args.xfixes_cursor){
xcim=XFixesGetCursorImage(pdata->dpy);
@@ -508,7 +508,7 @@
if (!pdata->args.full_shots) {
- RectInsert(&pdata->rect_root,&mouse_pos_temp);
+ rmdRectInsert(&pdata->rect_root,&mouse_pos_temp);
}
else if(d_buff){
@@ -531,13 +531,13 @@
}
}
if(pdata->args.follow_mouse){
- MoveCaptureArea(&pdata->brwin,
- mouse_pos_abs.x+
- ((pdata->args.xfixes_cursor)?xcim->xhot:0),
- mouse_pos_abs.y+
- ((pdata->args.xfixes_cursor)?xcim->yhot:0),
- pdata->specs.width,
- pdata->specs.height);
+ rmdMoveCaptureArea(&pdata->brwin,
+ mouse_pos_abs.x+
+ ((pdata->args.xfixes_cursor)?xcim->xhot:0),
+ mouse_pos_abs.y+
+ ((pdata->args.xfixes_cursor)?xcim->yhot:0),
+ pdata->specs.width,
+ pdata->specs.height);
if(!pdata->args.noframe){
rmdMoveFrame(pdata->dpy,
pdata->shaped_w,
@@ -549,22 +549,22 @@
if(!pdata->args.full_shots){
pthread_mutex_lock(&pdata->yuv_mutex);
- UpdateImage(pdata->dpy,
- &pdata->enc_data->yuv,
- &pdata->specs,
- &pdata->rect_root,
- &temp_brwin,
- pdata->enc_data,
- image->data,
- pdata->args.noshared,
- &shminfo,
- pdata->shm_opcode,
- pdata->args.no_quick_subsample);
- BlocksFromList(&pdata->rect_root,
- temp_brwin.rrect.x,
- temp_brwin.rrect.y,
- pdata->enc_data->yuv.y_width/Y_UNIT_WIDTH,
- pdata->enc_data->yuv.y_height/Y_UNIT_WIDTH);
+ rmdUpdateImage(pdata->dpy,
+ &pdata->enc_data->yuv,
+ &pdata->specs,
+ &pdata->rect_root,
+ &temp_brwin,
+ pdata->enc_data,
+ image->data,
+ pdata->args.noshared,
+ &shminfo,
+ pdata->shm_opcode,
+ pdata->args.no_quick_subsample);
+ rmdBlocksFromList(&pdata->rect_root,
+ temp_brwin.rrect.x,
+ temp_brwin.rrect.y,
+ pdata->enc_data->yuv.y_width/Y_UNIT_WIDTH,
+ pdata->enc_data->yuv.y_height/Y_UNIT_WIDTH);
pthread_mutex_unlock(&pdata->yuv_mutex);
}
else{
@@ -581,13 +581,13 @@
(temp_brwin.rrect.y),AllPlanes);
}
if(pdata->args.noshared){
- GetZPixmap( pdata->dpy,
- pdata->specs.root,
- image->data,
- temp_brwin.rrect.x,
- temp_brwin.rrect.y,
- temp_brwin.rrect.width,
- temp_brwin.rrect.height);
+ rmdGetZPixmap( pdata->dpy,
+ pdata->specs.root,
+ image->data,
+ temp_brwin.rrect.x,
+ temp_brwin.rrect.y,
+ temp_brwin.rrect.width,
+ temp_brwin.rrect.height);
}
pthread_mutex_lock(&pdata->yuv_mutex);
for(i=0;i<blocknum_x*blocknum_y;i++){
@@ -680,7 +680,7 @@
}
}
if(!pdata->args.full_shots){
- ClearList(&pdata->rect_root);
+ rmdClearList(&pdata->rect_root);
}
if (pdata->encoder_busy) {
pdata->frames_lost++;
Modified: trunk/recordmydesktop/src/rmd_get_frame.h
===================================================================
--- trunk/recordmydesktop/src/rmd_get_frame.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_get_frame.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -35,7 +35,7 @@
* either directly(full shots) or by calling UpdateImage.
* \param pdata ProgData struct containing all program data
*/
-void *GetFrame(ProgData *pdata);
+void *rmdGetFrame(ProgData *pdata);
#endif
Modified: trunk/recordmydesktop/src/rmd_getzpixmap.c
===================================================================
--- trunk/recordmydesktop/src/rmd_getzpixmap.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_getzpixmap.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -37,13 +37,13 @@
-int GetZPixmap(Display *dpy,
- Window root,
- char *data,
- int x,
- int y,
- int width,
- int height){
+int rmdGetZPixmap(Display *dpy,
+ Window root,
+ char *data,
+ int x,
+ int y,
+ int width,
+ int height){
xGetImageReply reply;
xGetImageReq *request;
long nbytes;
@@ -69,15 +69,15 @@
return 0;
}
-int GetZPixmapSHM(Display *dpy,
- Window root,
- XShmSegmentInfo *shminfo,
- int shm_opcode,
- char *data,
- int x,
- int y,
- int width,
- int height){
+int rmdGetZPixmapSHM(Display *dpy,
+ Window root,
+ XShmSegmentInfo *shminfo,
+ int shm_opcode,
+ char *data,
+ int x,
+ int y,
+ int width,
+ int height){
xShmGetImageReply reply;
xShmGetImageReq *request=NULL;
long nbytes;
Modified: trunk/recordmydesktop/src/rmd_getzpixmap.h
===================================================================
--- trunk/recordmydesktop/src/rmd_getzpixmap.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_getzpixmap.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -52,13 +52,13 @@
*
* \returns 0 on Success 1 on Failure
*/
-int GetZPixmap(Display *dpy,
- Window root,
- char *data,
- int x,
- int y,
- int width,
- int height);
+int rmdGetZPixmap(Display *dpy,
+ Window root,
+ char *data,
+ int x,
+ int y,
+ int width,
+ int height);
/**
* Rerieve pixmap data from xserver through the MIT-Shm extension
@@ -85,15 +85,15 @@
*
* \returns 0 on Success 1 on Failure
*/
-int GetZPixmapSHM(Display *dpy,
- Window root,
- XShmSegmentInfo *shminfo,
- int shm_opcode,
- char *data,
- int x,
- int y,
- int width,
- int height);
+int rmdGetZPixmapSHM(Display *dpy,
+ Window root,
+ XShmSegmentInfo *shminfo,
+ int shm_opcode,
+ char *data,
+ int x,
+ int y,
+ int width,
+ int height);
#endif
Modified: trunk/recordmydesktop/src/rmd_init_encoder.c
===================================================================
--- trunk/recordmydesktop/src/rmd_init_encoder.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_init_encoder.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -53,7 +53,7 @@
}
-static int IncrementalNaming(char **name) {
+static int rmdIncrementalNaming(char **name) {
struct stat buff;
char *base_name__;
int i=0,
@@ -90,7 +90,7 @@
return 0;
}
-void InitEncoder(ProgData *pdata,EncData *enc_data_t,int buffer_ready){
+void rmdInitEncoder(ProgData *pdata,EncData *enc_data_t,int buffer_ready){
int y0,
y1,
@@ -124,7 +124,7 @@
}
if (!pdata->args.overwrite) {
- IncrementalNaming(&(pdata)->args.filename);
+ rmdIncrementalNaming(&(pdata)->args.filename);
fprintf(stderr, "Output file: %s\n", pdata->args.filename);
}
Modified: trunk/recordmydesktop/src/rmd_init_encoder.h
===================================================================
--- trunk/recordmydesktop/src/rmd_init_encoder.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_init_encoder.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -38,10 +38,10 @@
* \param enc_data_t Encoding options
*
* \param buffer_ready when 1, the yuv buffer must be preallocated
-* when 0 InitEncoder will alocate a new one
+* when 0 rmdInitEncoder will alocate a new one
*
*/
-void InitEncoder(ProgData *pdata,EncData *enc_data_t,int buffer_ready);
+void rmdInitEncoder(ProgData *pdata,EncData *enc_data_t,int buffer_ready);
#endif
Modified: trunk/recordmydesktop/src/rmd_initialize_data.c
===================================================================
--- trunk/recordmydesktop/src/rmd_initialize_data.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_initialize_data.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -42,10 +42,10 @@
#include <string.h>
#ifdef HAVE_LIBASOUND
-static void FixBufferSize(snd_pcm_uframes_t *buffsize) {
+static void rmdFixBufferSize(snd_pcm_uframes_t *buffsize) {
snd_pcm_uframes_t buffsize_t=*buffsize,
#else
-static void FixBufferSize(u_int32_t *buffsize) {
+static void rmdFixBufferSize(u_int32_t *buffsize) {
u_int32_t buffsize_t=*buffsize,
#endif
buffsize_ret=1;
@@ -57,20 +57,20 @@
(int)buffsize_ret,(int)*buffsize);
}
-int InitializeData(ProgData *pdata,
- EncData *enc_data,
- CacheData *cache_data){
+int rmdInitializeData(ProgData *pdata,
+ EncData *enc_data,
+ CacheData *cache_data){
int i;
fprintf(stderr,"Initializing...\n");
- MakeMatrices();
+ rmdMakeMatrices();
if(pdata->args.have_dummy_cursor){
- pdata->dummy_pointer = MakeDummyPointer(pdata->dpy,
- &pdata->specs,
- 16,
- pdata->args.cursor_color,
- 0,
- &pdata->npxl);
+ pdata->dummy_pointer = rmdMakeDummyPointer(pdata->dpy,
+ &pdata->specs,
+ 16,
+ pdata->args.cursor_color,
+ 0,
+ &pdata->npxl);
pdata->dummy_p_size=16;
}
else
@@ -107,24 +107,24 @@
if(!pdata->args.nosound){
if(!pdata->args.use_jack){
- FixBufferSize(&pdata->args.buffsize);
+ rmdFixBufferSize(&pdata->args.buffsize);
#ifdef HAVE_LIBASOUND
- pdata->sound_handle=OpenDev( pdata->args.device,
- &pdata->args.channels,
- &pdata->args.frequency,
- &pdata->args.buffsize,
- &pdata->periodsize,
- &pdata->periodtime,
- &pdata->hard_pause);
+ pdata->sound_handle=rmdOpenDev(pdata->args.device,
+ &pdata->args.channels,
+ &pdata->args.frequency,
+ &pdata->args.buffsize,
+ &pdata->periodsize,
+ &pdata->periodtime,
+ &pdata->hard_pause);
pdata->sound_framesize=((snd_pcm_format_width(
SND_PCM_FORMAT_S16_LE))/8)*
pdata->args.channels;
if(pdata->sound_handle==NULL){
#else
- pdata->sound_handle=OpenDev(pdata->args.device,
- pdata->args.channels,
- pdata->args.frequency);
+ pdata->sound_handle=rmdOpenDev(pdata->args.device,
+ pdata->args.channels,
+ pdata->args.frequency);
pdata->periodtime=(1000000*pdata->args.buffsize)/
((pdata->args.channels<<1)*pdata->args.frequency);
//when using OSS periodsize serves as an alias of buffsize
@@ -149,7 +149,7 @@
pdata->jdata->sound_data_read=&pdata->sound_data_read;
pdata->jdata->capture_started=0;
- if((jack_error=StartJackClient(pdata->jdata))!=0)
+ if((jack_error=rmdStartJackClient(pdata->jdata))!=0)
return jack_error;
pdata->args.buffsize=pdata->jdata->buffersize;
@@ -169,9 +169,9 @@
}
if(pdata->args.encOnTheFly)
- InitEncoder(pdata,enc_data,0);
+ rmdInitEncoder(pdata,enc_data,0);
else
- InitCacheData(pdata,enc_data,cache_data);
+ rmdInitCacheData(pdata,enc_data,cache_data);
for(i=0;i<(pdata->enc_data->yuv.y_width*pdata->enc_data->yuv.y_height);i++)
pdata->enc_data->yuv.y[i]=0;
@@ -193,7 +193,7 @@
}
-void SetupDefaultArgs(ProgArgs *args) {
+void rmdSetupDefaultArgs(ProgArgs *args) {
args->delay = 0;
args->windowid = 0;
@@ -253,7 +253,7 @@
strcpy(args->filename, "out.ogv");
}
-void CleanUp(void){
+void rmdCleanUp(void){
free(yblocks);
free(ublocks);
Modified: trunk/recordmydesktop/src/rmd_initialize_data.h
===================================================================
--- trunk/recordmydesktop/src/rmd_initialize_data.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_initialize_data.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -42,21 +42,21 @@
*
* \returns 0 on success, other values must cause the program to exit
*/
-int InitializeData(ProgData *pdata,
- EncData *enc_data,
- CacheData *cache_data);
+int rmdInitializeData(ProgData *pdata,
+ EncData *enc_data,
+ CacheData *cache_data);
/**
* Sets up the ProgArgs structure to default values.
*/
-void SetupDefaultArgs(ProgArgs *args);
+void rmdSetupDefaultArgs(ProgArgs *args);
/**
* Currently only frees some memory
* (y,u,v blocks)
*
*/
-void CleanUp(void);
+void rmdCleanUp(void);
#endif
Modified: trunk/recordmydesktop/src/rmd_jack.c
===================================================================
--- trunk/recordmydesktop/src/rmd_jack.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_jack.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -46,7 +46,7 @@
*
* \returns Zero always
*/
-static int JackCapture(jack_nframes_t nframes,void *jdata_t) {
+static int rmdJackCapture(jack_nframes_t nframes,void *jdata_t) {
int i=0;
JackData *jdata=(JackData *)jdata_t;
@@ -67,7 +67,7 @@
/*FIXME */
//This is not safe.
//cond_var signaling must move away from signal handlers
-//alltogether (JackCapture, SetExpired, SetPaused).
+//alltogether (rmdJackCapture, SetExpired, SetPaused).
//Better would be a set of pipes for each of these.
//The callback should write on the pipe and the main thread
//should perform a select over the fd's, signaling afterwards the
@@ -87,7 +87,7 @@
*
* \returns 0 on Success, 1 on failure
*/
-static int SetupPorts(JackData *jdata) {
+static int rmdSetupPorts(JackData *jdata) {
int i=0;
jdata->ports=malloc(sizeof(jack_port_t *)*
jdata->nports);
@@ -126,7 +126,7 @@
//the program should stop recording,
//encode the result(if not on the fly)
//an exit cleanly.
-static void JackShutdown(void *jdata_t) {
+static void rmdJackShutdown(void *jdata_t) {
JackData *jdata = (JackData *)jdata_t;
jdata->pdata->running = FALSE;
@@ -134,7 +134,7 @@
fprintf (stderr, "JACK shutdown\n");
}
-int StartJackClient(JackData *jdata){
+int rmdStartJackClient(JackData *jdata){
float ring_buffer_size=0.0;
int pid;
char pidbuf[8];
@@ -176,14 +176,14 @@
jdata->nports);
jdata->sound_buffer=
(*jack_ringbuffer_create)((int)(ring_buffer_size+0.5));//round up
- jack_set_process_callback(jdata->client,JackCapture,jdata);
- jack_on_shutdown(jdata->client,JackShutdown,jdata);
+ jack_set_process_callback(jdata->client,rmdJackCapture,jdata);
+ jack_on_shutdown(jdata->client,rmdJackShutdown,jdata);
if (jack_activate(jdata->client)) {
fprintf(stderr,"cannot activate client!\n");
return 16;
}
- if(SetupPorts(jdata)){
+ if(rmdSetupPorts(jdata)){
jack_client_close(jdata->client);
return 17;
}
@@ -191,7 +191,7 @@
return 0;
}
-int StopJackClient(JackData *jdata){
+int rmdStopJackClient(JackData *jdata){
int ret=0;
(*jack_ringbuffer_free)(jdata->sound_buffer);
Modified: trunk/recordmydesktop/src/rmd_jack.h
===================================================================
--- trunk/recordmydesktop/src/rmd_jack.h 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_jack.h 2009-01-10 20:00:06 UTC (rev 590)
@@ -41,7 +41,7 @@
* \returns 0 on Success, error code on failure
* (depending on where the error occured)
*/
-int StartJackClient(JackData *jdata);
+int rmdStartJackClient(JackData *jdata);
/**
* Close Jack Client
@@ -51,7 +51,7 @@
*
* \returns 0 on Success, 1 on failure
*/
-int StopJackClient(JackData *jdata);
+int rmdStopJackClient(JackData *jdata);
#endif
Modified: trunk/recordmydesktop/src/rmd_load_cache.c
===================================================================
--- trunk/recordmydesktop/src/rmd_load_cache.c 2009-01-10 12:43:52 UTC (rev 589)
+++ trunk/recordmydesktop/src/rmd_load_cache.c 2009-01-10 20:00:06 UTC (rev 590)
@@ -66,12 +66,12 @@
}CachedFrame;
-static void LoadBlock(unsigned char *dest,
- unsigned char *source,
- int blockno,
- int width,
- int height,
- int blockwidth) {
+static void rmdLoadBlock(unsigned char *dest,
+ unsigned char *source,
+ int blockno,
+ int width,
+ int height,
+ int blockwidth) {
int j,
block_i=blockno/(width/blockwidth),//place on the grid
block_k=blockno%(width/blockwidth);
@@ -82,7 +82,7 @@
}
//returns number of bytes
-static int ReadZF(void * buffer, size_t size, size_t nmemb, FILE *ucfp, gzFile *ifp) {
+static int rmdReadZF(void * buffer, size_t size, size_t nmemb, FILE *ucfp, gzFile *ifp) {
if((ifp!=NULL && ucfp!=NULL)||
(ifp==NULL && ucfp==NULL))
return -1;
@@ -93,66 +93,66 @@
return gzread(ifp,buffer,size*nmemb);
}
-static int ReadFrame(CachedFrame *frame, FILE *ucfp, gzFile *ifp) {
+static int rmdReadFrame(CachedFrame *frame, FILE *ucfp, gzFile *ifp) {
int index_entry_size=sizeof(u_int32_t);
if(frame->header->Ynum>0){
- if(ReadZF(frame->YBlocks,
- index_entry_size,
- frame->header->Ynum,
- ucfp,
- ifp)!=index_entry_size*frame->header->Ynum){
+ if(rmdReadZF(frame->YBlocks,
+ index_entry_size,
+ frame->header->Ynum,
+ ucfp,
+ ifp)!=index_entry_size*frame->header->Ynum){
return -1;
}
}
if(frame->header->Unum>0){
- if(ReadZF(frame->UBlocks,
- index_entry_size,
- frame->header->Unum,
- ucfp,
- ifp)!=index_entry_size*frame->header->Unum){
+ if(rmdReadZF(frame->UBlocks,
+ index_entry_size,
+ frame->header->Unum,
+ ucfp,
+ ifp)!=index_entry_size*frame->header->Unum){
return -1;
}
}
if(frame->header->Vnum>0){
- if(ReadZF(frame->VBlocks,
- index_entry_size,
- frame->header->Vnum,
- ucfp,
- ifp)!=index_entry_size*frame->header->Vnum){
+ if(rmdReadZF(frame->VBlocks,
+ index_entry_size,
+ frame->header->Vnum,
+ ucfp,
+ ifp)!=index_entry_size*frame->header->Vnum){
return -1;
}
}
if(frame->header->Ynum>0){
- if(ReadZF(frame->YData,
- Y_UNIT_BYTES,
- frame->header->Ynum,
- ucfp,
- ifp)!=Y_UNIT_BYTES*frame->header->Ynum){
+ if(rmdReadZF(frame->YData,
+ Y_UNIT_BYTES,
+ frame->header->Ynum,
+ ucfp,
+ ifp)!=Y_UNIT_BYTES*frame->header->Ynum){
return -2;
}
}
if(frame->header->Unum>0){
- if(ReadZF(frame->UData,
- UV_UNIT_BYTES,
- frame->header->Unum,
- ucfp,
- ifp)!=UV_UNIT_BYTES*frame->header->Unum){
+ if(rmdReadZF(frame->UData,
+ UV_UNIT_BYTES,
+ frame->header->Unum,
+ ucfp,
+ ifp)!=UV_UNIT_BYTES*frame->header->Unum){
return -2;
}
}
if(frame->header->Vnum>0){
- if(ReadZF(frame->VData,
- UV_UNIT_BYTES,
- frame->header->Vnum,
- ucfp,
- ifp)!=UV_UNIT_BYTES*frame->header->Vnum){
+ if(rmdReadZF(frame->VData,
+ UV_UNIT_BYTES,
+ frame->header->Vnum,
+ ucfp,
+ ifp)!=UV_UNIT_BYTES*frame->header->Vnum){
return -2;
}
}
return 0;
}
-void *LoadCache(ProgData *pdata){
+void *rmdLoadCache(ProgData *pdata){
yuv_buffer *yuv=&pdata->enc_data->yuv;
gzFile *ifp=NULL;
@@ -223,7 +223,7 @@
if(missing_frames>0){
extra_frames++;
missing_frames--;
- SyncEncodeImageBuffer(pdata);
+ rmdSyncEncodeImageBuffer(pdata);
}
else if(((!pdata->args.zerocompression)&&
(gzread(ifp,frame.header,sizeof(FrameHeader))==
@@ -245,40 +245,40 @@
if( (frame.header->Ynum<=blocknum_x*blocknum_y) &&
(frame.header->Unum<=blocknum_x*blocknum_y) &&
(frame.header->Vnum<=blocknum_x*blocknum_y) &&
- (!ReadFrame(&frame,
- ((pdata->args.zerocompression)?ucfp:NULL),
- ((pdata->args.zerocompression)?NULL:ifp)))
+ (!rmdReadFrame(&frame,
+ ((pdata->args.zerocompression)?ucfp:NULL),
+ ((pdata->args.zerocompression)?NULL:ifp)))
){
//load the blocks for each buffer
if(frame.header->Ynum)
for(j=0;j<frame.header->Ynum;j++)
- LoadBlock( yuv->y,
- &frame.YData[j*blockszy],
- frame.YBlocks[j],
- yuv->y_width,
- yuv->y_height,
- Y_UNIT_WIDTH);
+ rmdLoadBlock(yuv->y,
+ &frame.YData[j*blockszy],
+ frame.YBlocks[j],
+ yuv->y_width,
+ yuv->y_height,
+ Y_UNIT_WIDTH);
if(frame.header->Unum)
for(j=0;j<frame.header->Unum;j++)
- LoadBlock( yuv->u,
- &frame.UData[j*blockszuv],
- frame.UBlocks[j],
- yuv->uv_width,
- yuv->uv_height,
- UV_UNIT_WIDTH);
+ rmdLoadBlock(yuv->u,
+ &frame.UData[j*blockszuv],
+ frame.UBlocks[j],
+ yuv->uv_width,
+ yuv->uv_height,
+ UV_UNIT_WIDTH);
if(frame.header->Vnum)
for(j=0;j<frame.header->Vnum;j++)
- LoadBlock( yuv->v,
- &frame.VData[j*blockszuv],
- frame.VBlocks[j],
- yuv->uv_width,
- yuv->uv_height,
- UV_UNIT_WIDTH);
+ rmdLoadBlock(yuv->v,
+ &frame.VData[j*blockszuv],
+ frame.VBlocks[j],
+ yuv->uv_width,
+ yuv->uv_height,
+ UV_UNIT_WIDTH);
//encode. This is not made in a thread since
//now blocking is not a problem
//and this way sync problems
//can be avoided more easily.
- SyncEncodeIma...
[truncated message content] |
|
From: svn c. f. r. <rec...@li...> - 2009-01-10 12:43:57
|
Revision: 589
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=589&view=rev
Author: enselic
Date: 2009-01-10 12:43:52 +0000 (Sat, 10 Jan 2009)
Log Message:
-----------
src/rmd_parseargs.c: Remove silent backwards compatibility for
-longoptions in preparation for libpopt migration.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_parseargs.c
Modified: trunk/recordmydesktop/src/rmd_parseargs.c
===================================================================
--- trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-10 11:57:10 UTC (rev 588)
+++ trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-10 12:43:52 UTC (rev 589)
@@ -57,10 +57,6 @@
"\n");
}
-/**
- * Still has backwards compatible options like -this, but --this is
- * what is documented.
- */
boolean ParseArgs(int argc, char **argv, ProgArgs *arg_return) {
int i;
char *usage =
@@ -128,8 +124,7 @@
}
}
for(i=1;i<argc;i++){
- if (strcmp(argv[i], "--delay") == 0 ||
- strcmp(argv[i], "-delay") == 0) {
+ if (strcmp(argv[i], "--delay") == 0) {
if(i+1<argc){
float num=atof(argv[i+1]);
if(num>0.0){
@@ -159,8 +154,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--windowid") == 0 ||
- strcmp(argv[i], "-windowid") == 0) {
+ else if (strcmp(argv[i], "--windowid") == 0) {
if(i+1<argc){
Window num=strtod(argv[i+1],NULL);
if(num>0)
@@ -178,8 +172,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--display") == 0 ||
- strcmp(argv[i], "-display") == 0) {
+ else if (strcmp(argv[i], "--display") == 0) {
if(i+1<argc){
if(arg_return->display!=NULL)
free(arg_return->display);
@@ -224,8 +217,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--width") == 0 ||
- strcmp(argv[i], "-width") == 0) {
+ else if (strcmp(argv[i], "--width") == 0) {
if(i+1<argc){
int num=atoi(argv[i+1]);
if(num>0)
@@ -241,8 +233,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--height") == 0 ||
- strcmp(argv[i], "-height") == 0) {
+ else if (strcmp(argv[i], "--height") == 0) {
if(i+1<argc){
int num=atoi(argv[i+1]);
if(num>0)
@@ -270,8 +261,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--fps") == 0 ||
- strcmp(argv[i], "-fps") == 0) {
+ else if (strcmp(argv[i], "--fps") == 0) {
if(i+1<argc){
float num=atof(argv[i+1]);
if(num>0.0)
@@ -287,8 +277,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--v_quality") == 0 ||
- strcmp(argv[i], "-v_quality") == 0) {
+ else if (strcmp(argv[i], "--v_quality") == 0) {
if(i+1<argc){
int num=atoi(argv[i+1]);
if((num>=0)&&(num<64))
@@ -306,8 +295,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--v_bitrate") == 0 ||
- strcmp(argv[i], "-v_bitrate") == 0) {
+ else if (strcmp(argv[i], "--v_bitrate") == 0) {
if(i+1<argc){
int num=atoi(argv[i+1]);
if((num>=45000)&&(num<=2000000))
@@ -325,8 +313,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--dummy-cursor") == 0 ||
- strcmp(argv[i], "-dummy-cursor") == 0) {
+ else if (strcmp(argv[i], "--dummy-cursor") == 0) {
if(i+1<argc){
if(!strcmp(argv[i+1],"white"))
arg_return->cursor_color=0;
@@ -349,8 +336,7 @@
}
else if(!strcmp(argv[i],"--no-cursor"))
arg_return->xfixes_cursor=0;
- else if (strcmp(argv[i], "--freq") == 0 ||
- strcmp(argv[i], "-freq") == 0) {
+ else if (strcmp(argv[i], "--freq") == 0) {
if(i+1<argc){
int num=atoi(argv[i+1]);
if(num>0)
@@ -366,8 +352,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--channels") == 0 ||
- strcmp(argv[i], "-channels") == 0) {
+ else if (strcmp(argv[i], "--channels") == 0) {
if(i+1<argc){
int num=atoi(argv[i+1]);
if(num>0)
@@ -383,8 +368,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--s_quality") == 0 ||
- strcmp(argv[i], "-s_quality") == 0) {
+ else if (strcmp(argv[i], "--s_quality") == 0) {
if(i+1<argc){
int num=atoi(argv[i+1]);
if((num>=-1)&&(num<=10))
@@ -402,8 +386,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--device") == 0 ||
- strcmp(argv[i], "-device") == 0) {
+ else if (strcmp(argv[i], "--device") == 0) {
if(i+1<argc){
free(arg_return->device);
arg_return->device=malloc(strlen(argv[i+1])+1);
@@ -415,8 +398,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--workdir") == 0 ||
- strcmp(argv[i], "-workdir") == 0) {
+ else if (strcmp(argv[i], "--workdir") == 0) {
if(i+1<argc){
free(arg_return->workdir);
arg_return->workdir=malloc(strlen(argv[i+1])+1);
@@ -428,8 +410,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--pause-shortcut") == 0 ||
- strcmp(argv[i], "-pause-shortcut") == 0) {
+ else if (strcmp(argv[i], "--pause-shortcut") == 0) {
if(i+1<argc){
free(arg_return->pause_shortcut);
arg_return->pause_shortcut=malloc(strlen(argv[i+1])+1);
@@ -441,8 +422,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--stop-shortcut") == 0 ||
- strcmp(argv[i], "-stop-shortcut") == 0) {
+ else if (strcmp(argv[i], "--stop-shortcut") == 0) {
if(i+1<argc){
free(arg_return->stop_shortcut);
arg_return->stop_shortcut=malloc(strlen(argv[i+1])+1);
@@ -454,8 +434,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--buffer-size") == 0 ||
- strcmp(argv[i], "-buffer-size") == 0) {
+ else if (strcmp(argv[i], "--buffer-size") == 0) {
if(i+1<argc){
int num=atoi(argv[i+1]);
if(num>0)
@@ -472,8 +451,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--use-jack") == 0 ||
- strcmp(argv[i], "-use-jack") == 0) {
+ else if (strcmp(argv[i], "--use-jack") == 0) {
if(i+1<argc){
#ifdef HAVE_LIBJACK
int k=i+1;
@@ -508,8 +486,7 @@
return FALSE;
}
}
- else if (strcmp(argv[i], "--ring-buffer-size") == 0 ||
- strcmp(argv[i], "-ring-buffer-size") == 0) {
+ else if (strcmp(argv[i], "--ring-buffer-size") == 0) {
if(i+1<argc){
float num=atof(argv[i+1]);
if(num>0.0)
@@ -527,8 +504,7 @@
}
i++;
}
- else if (strcmp(argv[i], "--rescue") == 0 ||
- strcmp(argv[i], "-rescue") == 0) {
+ else if (strcmp(argv[i], "--rescue") == 0) {
if(i+1<argc){
arg_return->rescue_path = argv[i + 1];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-10 12:22:12
|
Revision: 587
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=587&view=rev
Author: enselic
Date: 2009-01-10 11:35:06 +0000 (Sat, 10 Jan 2009)
Log Message:
-----------
configure.ac: Fix check for libjack by adding default actions to
action-if-found.
Modified Paths:
--------------
trunk/recordmydesktop/configure.ac
Modified: trunk/recordmydesktop/configure.ac
===================================================================
--- trunk/recordmydesktop/configure.ac 2009-01-08 19:05:06 UTC (rev 586)
+++ trunk/recordmydesktop/configure.ac 2009-01-10 11:35:06 UTC (rev 587)
@@ -95,7 +95,10 @@
AC_MSG_ERROR([Can't find libpthread]))
if test x$jack = xtrue ; then
-AC_CHECK_LIB([jack],[jack_activate],jack_lib_found=true,)
+AC_CHECK_LIB([jack],[jack_activate],
+ [LIBS="$LIBS -ljack"
+ AC_DEFINE([HAVE_LIBJACK], [1], [Define to 1 if you have libjack.])
+ jack_lib_found=true])
fi
if test x$oss = xfalse; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-10 12:18:32
|
Revision: 588
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=588&view=rev
Author: enselic
Date: 2009-01-10 11:57:10 +0000 (Sat, 10 Jan 2009)
Log Message:
-----------
src/rmd_types.h: Make ProgArgs::jack_port_names a fixed size
100-element array.
src/rmd_initialize_data.c: Reset ProgArgs::jack_port_names using
memset().
src/rmd_parseargs.c: With ProgArgs::jack_port_names as a fixed size
array we can read the --use-jack options in a single pass which makes
the code more libpopt migration friendly.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_initialize_data.c
trunk/recordmydesktop/src/rmd_parseargs.c
trunk/recordmydesktop/src/rmd_types.h
Modified: trunk/recordmydesktop/src/rmd_initialize_data.c
===================================================================
--- trunk/recordmydesktop/src/rmd_initialize_data.c 2009-01-10 11:35:06 UTC (rev 587)
+++ trunk/recordmydesktop/src/rmd_initialize_data.c 2009-01-10 11:57:10 UTC (rev 588)
@@ -214,7 +214,6 @@
args->noframe = 0;
args->jack_nports = 0;
args->jack_ringbuffer_secs = 3.0;
- args->jack_port_names = NULL;
args->zerocompression = 1;
args->no_quick_subsample = 1;
args->cursor_color = 1;
@@ -236,6 +235,8 @@
args->display = NULL;
}
+ memset(args->jack_port_names, 0, sizeof(args->jack_port_names));
+
args->device = (char *) malloc(strlen(DEFAULT_AUDIO_DEVICE) + 1);
strcpy(args->device, DEFAULT_AUDIO_DEVICE);
Modified: trunk/recordmydesktop/src/rmd_parseargs.c
===================================================================
--- trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-10 11:35:06 UTC (rev 587)
+++ trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-10 11:57:10 UTC (rev 588)
@@ -478,23 +478,20 @@
#ifdef HAVE_LIBJACK
int k=i+1;
arg_return->jack_nports=0;
- while((k<argc)&&(argv[k][0]!='-')){
+ while((k<argc)&&(argv[k][0]!='-')&&k-i-1<RMD_MAX_JACK_PORTS){
arg_return->jack_nports++;
+
+ arg_return->jack_port_names[k-i-1]=malloc(strlen(argv[k])+1);
+ strcpy(arg_return->jack_port_names[k-i-1],argv[k]);
+
+ arg_return->use_jack=1;
+
k++;
}
- if(arg_return->jack_nports>0){
- arg_return->jack_port_names=malloc(sizeof(char*)*
- arg_return->jack_nports);
- for(k=i+1;k<i+1+arg_return->jack_nports;k++){
- arg_return->jack_port_names[k-i-1]=
- malloc(strlen(argv[k])+1);
- strcpy(arg_return->jack_port_names[k-i-1],
- argv[k]);
- }
- i+=arg_return->jack_nports;
- arg_return->use_jack=1;
- }
- else{
+
+ i+=arg_return->jack_nports;
+
+ if (arg_return->jack_nports==0) {
fprintf(stderr,"Argument Usage: --use-jack port1"
" port2... portn\n");
return FALSE;
Modified: trunk/recordmydesktop/src/rmd_types.h
===================================================================
--- trunk/recordmydesktop/src/rmd_types.h 2009-01-10 11:35:06 UTC (rev 587)
+++ trunk/recordmydesktop/src/rmd_types.h 2009-01-10 11:57:10 UTC (rev 588)
@@ -83,6 +83,8 @@
#define TRUE (!FALSE)
#endif
+#define RMD_MAX_JACK_PORTS (100)
+
// Forward declarations
typedef struct _ProgData ProgData;
@@ -149,7 +151,7 @@
//(do not add a .number postfix)
int use_jack; //record audio with jack
unsigned int jack_nports;
- char **jack_port_names;
+ char *jack_port_names[RMD_MAX_JACK_PORTS];
float jack_ringbuffer_secs;
}ProgArgs;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-08 19:05:18
|
Revision: 586
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=586&view=rev
Author: enselic
Date: 2009-01-08 19:05:06 +0000 (Thu, 08 Jan 2009)
Log Message:
-----------
src/rmd_parseargs.c: Put configure-time option dependent stuff in
PrintConfig outside the function as this makes the code a bit nicer to
read.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_parseargs.c
Modified: trunk/recordmydesktop/src/rmd_parseargs.c
===================================================================
--- trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-07 22:01:04 UTC (rev 585)
+++ trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-08 19:05:06 UTC (rev 586)
@@ -34,20 +34,27 @@
#include <string.h>
-static void PrintConfig(void) {
- fprintf(stderr,"\nrecordMyDesktop was compiled with"
- " the following options:\n\n");
#ifdef HAVE_LIBJACK
- fprintf(stdout,"Jack\t\t\t:Enabled\n");
+#define RMD_LIBJACK_STATUS "Enabled"
#else
- fprintf(stdout,"Jack\t\t\t:Disabled\n");
+#define RMD_LIBJACK_STATUS "Disabled"
#endif
+
#ifdef HAVE_LIBASOUND
- fprintf(stdout,"Default Audio Backend\t:ALSA\n");
+#define RMD_LIBASOUND_STATUS "ALSA"
#else
- fprintf(stdout,"Default Audio Backend\t:OSS\n");
+#define RMD_LIBASOUND_STATUS "OSS"
#endif
- fprintf(stderr,"\n\n");
+
+static void PrintConfig(void) {
+ fprintf(stderr,
+ "\n"
+ "recordMyDesktop was compiled with the following options:\n"
+ "\n"
+ "Jack:\t\t\t" RMD_LIBJACK_STATUS "\n"
+ "Default Audio Backend:\t" RMD_LIBASOUND_STATUS "\n"
+ "\n"
+ "\n");
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2009-01-07 22:01:15
|
Revision: 585
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=585&view=rev
Author: enselic
Date: 2009-01-07 22:01:04 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
src/rmd_parseargs.c: Reformat the Usage:-message and make the code
structure reflect the outputted message structure.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_parseargs.c
Modified: trunk/recordmydesktop/src/rmd_parseargs.c
===================================================================
--- trunk/recordmydesktop/src/rmd_parseargs.c 2008-12-13 17:46:41 UTC (rev 584)
+++ trunk/recordmydesktop/src/rmd_parseargs.c 2009-01-07 22:01:04 UTC (rev 585)
@@ -56,86 +56,62 @@
*/
boolean ParseArgs(int argc, char **argv, ProgArgs *arg_return) {
int i;
- char *usage="\nUsage:\n"
- "\trecordmydesktop [OPTIONS]^filename\n\n\n"
+ char *usage =
+ "\n"
+ "Usage:\n"
+ "\trecordmydesktop [OPTIONS]^filename\n"
+ "\n"
+ "\n"
+ "General Options:\n"
+ "\t-h or --help\t\tPrint this help and exit.\n"
+ "\t--version\t\tPrint program version and exit.\n"
+ "\t--print-config\t\tPrint info about options selected during compilation and exit.\n"
+ "\n"
+ "Image Options:\n"
+ "\t--windowid id_of_window\tid of window to be recorded.\n"
+ "\t--display DISPLAY\tDisplay to connect to.\n"
+ "\t-x X\t\t\tOffset in x direction.\n"
+ "\t-y Y\t\t\tOffset in y direction.\n"
+ "\t--width N\t\tWidth of recorded window.\n"
+ "\t--height N\t\tHeight of recorded window.\n"
+ "\n"
+ "\t--dummy-cursor color\tColor of the dummy cursor [black|white]\n"
+ "\t--no-cursor\t\tDisable drawing of the cursor.\n"
+ "\t--no-shared\t\tDisable usage of MIT-shared memory extension(Not Recommended!).\n"
+ "\t--full-shots\t\tTake full screenshot at every frame(Not recomended!).\n"
+ "\t--quick-subsampling\tDo subsampling of the chroma planes by discarding,not averaging.\n"
+ "\t--fps N(number>0.0)\tA positive number denoting desired framerate.\n"
+ "\n"
+ "Sound Options:\n"
+ "\t--channels N\t\t\tA positive number denoting desired sound channels in recording.\n"
+ "\t--freq N\t\t\tA positive number denoting desired sound frequency.\n"
+ "\t--buffer-size N\t\t\tA positive number denoting the desired sound buffer size (in frames,when using ALSA or OSS)\n"
+ "\t--ring-buffer-size N\t\tA float number denoting the desired ring buffer size (in seconds,when using JACK only).\n"
+ "\t--device SOUND_DEVICE\t\tSound device(default " DEFAULT_AUDIO_DEVICE ").\n"
+ "\t--use-jack port1 port2... portn\tRecord audio from the specified list of space-separated jack ports.\n"
+ "\t--no-sound\t\t\tDo not record sound.\n"
+ "\n"
+ "Encoding Options\n"
+ "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n"
+ "\t--v_quality n\t\tA number from 0 to 63 for desired encoded video quality(default 63).\n"
+ "\t--v_bitrate n\t\tA number from 45000 to 2000000 for desired encoded video bitrate(default 45000).\n"
+ "\t--s_quality n\t\tDesired audio quality(-1 to 10).\n"
+ "\n"
+ "Misc Options:\n"
+ "\t--rescue path_to_data\t\tEncode data from a previous, crashed, session.\n"
+ "\t--no-wm-check\t\t\tDo not try to detect the window manager(and set options according to it)\n"
+ "\t--pause-shortcut MOD+KEY\tShortcut that will be used for (un)pausing (default Control+Mod1+p).\n"
+ "\t--stop-shortcut MOD+KEY\t\tShortcut that will be used to stop the recording (default Control+Mod1+s).\n"
+ "\t--compress-cache\t\tImage data are cached with light compression.\n"
+ "\t--workdir DIR\t\t\tLocation where a temporary directory will be created to hold project files(default $HOME).\n"
+ "\t--delay n[H|h|M|m]\t\tNumber of secs(default),minutes or hours before capture starts(number can be float)\n"
+ "\t--overwrite\t\t\tIf there is already a file with the same name, delete it (default is to add a number postfix to the new one).\n"
+ "\t-o filename\t\t\tName of recorded video(default out.ogv).\n"
+ "\n"
+ "\tIf no other options are specified, filename can be given without the -o switch.\n"
+ "\n"
+ "\n";
- "General Options:\n"
- "\t-h or --help\t\tPrint this help and exit.\n"
- "\t--version\t\tPrint program version and exit.\n"
- "\t--print-config\t\tPrint info about options "
- "selected during compilation and exit.\n\n"
-
- "Image Options:\n"
- "\t--windowid id_of_window\tid of window to be recorded.\n"
- "\t--display DISPLAY\tDisplay to connect to.\n"
- "\t-x X\t\t\tOffset in x direction.\n"
- "\t-y Y\t\t\tOffset in y direction.\n"
- "\t--width N\t\tWidth of recorded window.\n"
- "\t--height N\t\tHeight of recorded window.\n\n"
-
- "\t--dummy-cursor color\tColor of the dummy cursor [black|white]\n"
- "\t--no-cursor\t\tDisable drawing of the cursor.\n"
- "\t--no-shared\t\tDisable usage of"
- " MIT-shared memory extension(Not Recommended!).\n"
-
- "\t--full-shots\t\tTake full screenshot at every frame(Not recomended!).\n"
- "\t--quick-subsampling\tDo subsampling"
- " of the chroma planes by discarding,not averaging.\n"
-
- "\t--fps N(number>0.0)\tA positive number denoting desired framerate.\n\n"
-
- "Sound Options:\n"
- "\t--channels N\t\t\tA positive number denoting"
- " desired sound channels in recording.\n"
-
- "\t--freq N\t\t\t\tA positive number denoting desired sound frequency.\n"
- "\t--buffer-size N\t\t\tA positive number denoting the desired"
- " sound buffer size (in frames,when using ALSA or OSS)\n"
- "\t--ring-buffer-size N\t\tA float number denoting the desired"
- " ring buffer size (in seconds,when using JACK only).\n"
-
- "\t--device SOUND_DEVICE\t\tSound device(default "
- DEFAULT_AUDIO_DEVICE
- ").\n"
- "\t--use-jack port1 port2... portn\tRecord audio from the specified\n"
- "\t\t\t\t\tlist of space-separated jack ports.\n"
- "\t--no-sound\t\t\tDo not record sound.\n\n"
-
- "Encoding Options\n"
- "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n"
- "\t--v_quality n\t\tA number from 0 to 63 for"
- " desired encoded video quality(default 63).\n"
-
- "\t--v_bitrate n\t\tA number from 45000 to 2000000"
- " for desired encoded video bitrate(default 45000).\n"
-
- "\t--s_quality n\t\tDesired audio quality(-1 to 10).\n\n"
-
- "Misc Options:\n"
- "\t--rescue path_to_data\tEncode data from a previous, crashed, session.\n"
- "\t--no-wm-check\t\tDo not try to detect"
- " the window manager(and set options according to it)\n"
-
- "\t--pause-shortcut MOD+KEY\tShortcut that will be used for (un)pausing"
- "(default Control+Mod1+p).\n"
- "\t--stop-shortcut MOD+KEY\tShortcut that will be used to stop the "
- "recording (default Control+Mod1+s).\n"
-
- "\t--compress-cache\tImage data are cached with light compression.\n"
- "\t--workdir DIR\t\tLocation where a temporary directory"
- " will be created to hold project files(default $HOME).\n"
-
- "\t--delay n[H|h|M|m]\tNumber of secs(default),minutes or hours"
- " before capture starts(number can be float)\n"
-
- "\t--overwrite\t\tIf there is already a file with the same name,"
- " delete it\n"
-
- "\t\t\t\t(default is to add a number postfix to the new one).\n"
- "\t-o filename\t\tName of recorded video(default out.ogv).\n"
- "\n\tIf no other options are specified, filename can be given "
- "without the -o switch.\n\n\n";
-
if(argc==2){
if(argv[1][0]!='-'){
free(arg_return->filename);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2008-12-13 17:46:45
|
Revision: 584
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=584&view=rev
Author: iovar
Date: 2008-12-13 17:46:41 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
Version changes.
Modified Paths:
--------------
trunk/recordmydesktop/ChangeLog
trunk/recordmydesktop/configure.ac
Modified: trunk/recordmydesktop/ChangeLog
===================================================================
--- trunk/recordmydesktop/ChangeLog 2008-12-13 17:20:24 UTC (rev 583)
+++ trunk/recordmydesktop/ChangeLog 2008-12-13 17:46:41 UTC (rev 584)
@@ -1,3 +1,10 @@
+/*Version 0.3.8.1*/
+* Fixed a bug that caused compilation to fail on some platforms, due
+to missing headers.
+* Minor code refactoring to assist maintainability and
+portability of the program.
+
+
/*Version 0.3.8*/
* Extensive refactoring and cleanups of the code from Martin Nordholts.
* Cursor-flickering bug has been fixed, by Martin.
Modified: trunk/recordmydesktop/configure.ac
===================================================================
--- trunk/recordmydesktop/configure.ac 2008-12-13 17:20:24 UTC (rev 583)
+++ trunk/recordmydesktop/configure.ac 2008-12-13 17:46:41 UTC (rev 584)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT( [recordmydesktop], [0.3.8], )
+AC_INIT( [recordmydesktop], [0.3.8.1], )
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/rmd.c])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2008-12-13 17:20:32
|
Revision: 583
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=583&view=rev
Author: iovar
Date: 2008-12-13 17:20:24 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
Added missing stdio.h and errno.h headers in any
files that needed them (could cause compilation failure on
some platforms). Also, rearranged the sequence with which include's
happen, so that any missing headers will be more likely to
show up as copilation errors, in the future.
rmd_yuv_utils.[ch] and rmd_block_utils.[ch] have been merged
within the former, as they deal with the same subject (converting
rgb buffers to yuv ones, with the only difference that rmd_block_utils
had the double-buffer convertions while rmd_yuv_utils dealt with the
single-buffered ones). Their headers also had the a circular dependency
(rmd_yuv_utils.h included rmd_block_utils.h and vice-versa).
rmd_math.[ch] was added. This file holds now the rmdRoundf function
which is a portable implementation of roundf (which depends on C99).
The reasoning behind the addition of these files, is that they might
hold more purely mathematical functions, in the future.
Modified Paths:
--------------
trunk/recordmydesktop/configure.ac
trunk/recordmydesktop/src/Makefile.am
trunk/recordmydesktop/src/rmd.c
trunk/recordmydesktop/src/rmd_cache.c
trunk/recordmydesktop/src/rmd_cache.h
trunk/recordmydesktop/src/rmd_cache_audio.c
trunk/recordmydesktop/src/rmd_cache_frame.c
trunk/recordmydesktop/src/rmd_capture_sound.c
trunk/recordmydesktop/src/rmd_encode_cache.c
trunk/recordmydesktop/src/rmd_encode_image_buffer.c
trunk/recordmydesktop/src/rmd_encode_sound_buffer.c
trunk/recordmydesktop/src/rmd_error.c
trunk/recordmydesktop/src/rmd_flush_to_ogg.c
trunk/recordmydesktop/src/rmd_frame.c
trunk/recordmydesktop/src/rmd_get_frame.c
trunk/recordmydesktop/src/rmd_getzpixmap.c
trunk/recordmydesktop/src/rmd_getzpixmap.h
trunk/recordmydesktop/src/rmd_init_encoder.c
trunk/recordmydesktop/src/rmd_initialize_data.c
trunk/recordmydesktop/src/rmd_jack.c
trunk/recordmydesktop/src/rmd_load_cache.c
trunk/recordmydesktop/src/rmd_macro.h
trunk/recordmydesktop/src/rmd_make_dummy_pointer.c
trunk/recordmydesktop/src/rmd_opendev.c
trunk/recordmydesktop/src/rmd_parseargs.c
trunk/recordmydesktop/src/rmd_poll_events.c
trunk/recordmydesktop/src/rmd_queryextensions.c
trunk/recordmydesktop/src/rmd_rectinsert.c
trunk/recordmydesktop/src/rmd_register_callbacks.c
trunk/recordmydesktop/src/rmd_rescue.c
trunk/recordmydesktop/src/rmd_setbrwindow.c
trunk/recordmydesktop/src/rmd_shortcuts.c
trunk/recordmydesktop/src/rmd_specsfile.c
trunk/recordmydesktop/src/rmd_threads.c
trunk/recordmydesktop/src/rmd_timer.c
trunk/recordmydesktop/src/rmd_types.h
trunk/recordmydesktop/src/rmd_update_image.c
trunk/recordmydesktop/src/rmd_update_image.h
trunk/recordmydesktop/src/rmd_wm_check.c
trunk/recordmydesktop/src/rmd_wm_is_compositing.c
trunk/recordmydesktop/src/rmd_yuv_utils.c
trunk/recordmydesktop/src/rmd_yuv_utils.h
trunk/recordmydesktop/src/skeleton.h
trunk/recordmydesktop/src/test-rectinsert-data.c
trunk/recordmydesktop/src/test-rectinsert.c
Added Paths:
-----------
trunk/recordmydesktop/src/rmd_math.c
trunk/recordmydesktop/src/rmd_math.h
Removed Paths:
-------------
trunk/recordmydesktop/src/rmd_block_utils.c
trunk/recordmydesktop/src/rmd_block_utils.h
Modified: trunk/recordmydesktop/configure.ac
===================================================================
--- trunk/recordmydesktop/configure.ac 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/configure.ac 2008-12-13 17:20:24 UTC (rev 583)
@@ -95,8 +95,7 @@
AC_MSG_ERROR([Can't find libpthread]))
if test x$jack = xtrue ; then
-AC_CHECK_LIB([jack],[jack_activate],,
- jack_lib_found=false)
+AC_CHECK_LIB([jack],[jack_activate],jack_lib_found=true,)
fi
if test x$oss = xfalse; then
@@ -120,8 +119,7 @@
if test x$audio_backend != xOSS; then
audio_backend="ALSA"
fi
-if test x$jack_lib_found != xfalse ; then
-# AC_DEFINE([HAVE_JACK_H],1,define to 1 if libjack is found) ,
+if test x$jack_lib_found = xtrue ; then
jack_support="Enabled"
else
jack_support="Disabled"
Modified: trunk/recordmydesktop/src/Makefile.am
===================================================================
--- trunk/recordmydesktop/src/Makefile.am 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/Makefile.am 2008-12-13 17:20:24 UTC (rev 583)
@@ -2,8 +2,6 @@
recordmydesktop_SOURCES = \
rmd.c \
- rmd_block_utils.c \
- rmd_block_utils.h \
rmd_cache.c \
rmd_cache.h \
rmd_cache_audio.c \
@@ -39,6 +37,8 @@
rmd_macro.h \
rmd_make_dummy_pointer.c \
rmd_make_dummy_pointer.h \
+ rmd_math.c \
+ rmd_math.h \
rmd_opendev.c \
rmd_opendev.h \
rmd_parseargs.c \
Modified: trunk/recordmydesktop/src/rmd.c
===================================================================
--- trunk/recordmydesktop/src/rmd.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -26,8 +26,6 @@
#include "config.h"
-#include "rmd_types.h"
-
#include "rmd_cache.h"
#include "rmd_encode_cache.h"
#include "rmd_error.h"
@@ -39,8 +37,14 @@
#include "rmd_shortcuts.h"
#include "rmd_threads.h"
#include "rmd_wm_is_compositing.h"
+#include "rmd_types.h"
+#include <X11/Xlib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+
int main(int argc,char **argv){
ProgData pdata;
int exit_status = 0;
Deleted: trunk/recordmydesktop/src/rmd_block_utils.c
===================================================================
--- trunk/recordmydesktop/src/rmd_block_utils.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_block_utils.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -1,37 +0,0 @@
-/******************************************************************************
-* recordMyDesktop *
-*******************************************************************************
-* *
-* Copyright (C) 2006,2007,2008 John Varouhakis *
-* *
-* *
-* This program is free software; you can redistribute it and/or modify *
-* it under the terms of the GNU General Public License as published by *
-* the Free Software Foundation; either version 2 of the License, or *
-* (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public License *
-* along with this program; if not, write to the Free Software *
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
-* *
-* *
-* *
-* For further information contact me at joh...@gm... *
-******************************************************************************/
-
-#include "config.h"
-
-#include "rmd_block_utils.h"
-
-
-// FIXME: These globals are modified in other source files! We keep
-// thsee here for now. These are the cache blocks. They need to be
-// accesible in the dbuf macros
-u_int32_t *yblocks,
- *ublocks,
- *vblocks;
Deleted: trunk/recordmydesktop/src/rmd_block_utils.h
===================================================================
--- trunk/recordmydesktop/src/rmd_block_utils.h 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_block_utils.h 2008-12-13 17:20:24 UTC (rev 583)
@@ -1,170 +0,0 @@
-/******************************************************************************
-* recordMyDesktop *
-*******************************************************************************
-* *
-* Copyright (C) 2006,2007,2008 John Varouhakis *
-* *
-* *
-* This program is free software; you can redistribute it and/or modify *
-* it under the terms of the GNU General Public License as published by *
-* the Free Software Foundation; either version 2 of the License, or *
-* (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public License *
-* along with this program; if not, write to the Free Software *
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
-* *
-* *
-* *
-* For further information contact me at joh...@gm... *
-******************************************************************************/
-
-#ifndef BLOCK_UTILS_H
-#define BLOCK_UTILS_H 1
-
-#include "rmd_macro.h"
-#include "rmd_types.h"
-#include "rmd_yuv_utils.h"
-
-
-// We keep these global for now. FIXME: Isolate them.
-extern u_int32_t *yblocks,
- *ublocks,
- *vblocks;
-
-#define POINT_IN_BLOCK(xv,yv,widthv,blocksize) ((yv/blocksize)*\
- (widthv/blocksize)+\
- (xv/blocksize))
-
-#define UPDATE_Y_PLANE_DBUF(data,\
- data_back,\
- x_tm,\
- y_tm,\
- height_tm,\
- width_tm,\
- yuv,\
- __bit_depth__){ \
- int k,i;\
- register u_int##__bit_depth__##_t t_val;\
- register unsigned char *yuv_y=yuv->y+x_tm+y_tm*yuv->y_width,\
- *_yr=Yr,*_yg=Yg,*_yb=Yb;\
- register u_int##__bit_depth__##_t *datapi=(u_int##__bit_depth__##_t *)data,\
- *datapi_back=(u_int##__bit_depth__##_t *)data_back;\
- for(k=0;k<height_tm;k++){\
- for(i=0;i<width_tm;i++){\
- if(*datapi!=*datapi_back){\
- t_val=*datapi;\
- *yuv_y=_yr[__RVALUE_##__bit_depth__(t_val)] +\
- _yg[__GVALUE_##__bit_depth__(t_val)] +\
- _yb[__BVALUE_##__bit_depth__(t_val)] ;\
- yblocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
- }\
- datapi++;\
- datapi_back++;\
- yuv_y++;\
- }\
- yuv_y+=yuv->y_width-width_tm;\
- }\
-}
-
-#define UPDATE_UV_PLANES_DBUF( data,\
- data_back,\
- x_tm,\
- y_tm,\
- height_tm,\
- width_tm,\
- yuv,\
- __sampling_type,\
- __bit_depth__){ \
- int k,i;\
- register u_int##__bit_depth__##_t t_val;\
- register unsigned char *yuv_u=yuv->u+x_tm/2+(y_tm*yuv->uv_width)/2,\
- *yuv_v=yuv->v+x_tm/2+(y_tm*yuv->uv_width)/2,\
- *_ur=Ur,*_ug=Ug,*_ubvr=UbVr,\
- *_vg=Vg,*_vb=Vb;\
- register u_int##__bit_depth__##_t *datapi=(u_int##__bit_depth__##_t *)data,\
- *datapi_next=NULL,\
- *datapi_back=(u_int##__bit_depth__##_t *)data_back,\
- *datapi_back_next=NULL;\
- if(__sampling_type==__PXL_AVERAGE){\
- datapi_next=datapi+width_tm;\
- datapi_back_next=datapi_back+width_tm;\
- for(k=0;k<height_tm;k+=2){\
- for(i=0;i<width_tm;i+=2){\
- if(( (*datapi!=*datapi_back) ||\
- (*(datapi+1)!=*(datapi_back+1)) ||\
- (*datapi_next!=*datapi_back_next) ||\
- (*(datapi_next+1)!=*(datapi_back_next+1)))){\
- UPDATE_A_UV_PIXEL( yuv_u,\
- yuv_v,\
- t_val,\
- datapi,\
- datapi_next,\
- _ur,_ug,_ubvr,_vg,_vb,\
- __sampling_type,\
- __bit_depth__)\
- ublocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
- vblocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
- }\
- datapi+=2;\
- datapi_back+=2;\
- if(__sampling_type==__PXL_AVERAGE){\
- datapi_next+=2;\
- datapi_back_next+=2;\
- }\
- yuv_u++;\
- yuv_v++;\
- }\
- yuv_u+=(yuv->y_width-width_tm)/2;\
- yuv_v+=(yuv->y_width-width_tm)/2;\
- datapi+=width_tm;\
- datapi_back+=width_tm;\
- if(__sampling_type==__PXL_AVERAGE){\
- datapi_next+=width_tm;\
- datapi_back_next+=width_tm;\
- }\
- }\
- }\
- else{\
- for(k=0;k<height_tm;k+=2){\
- for(i=0;i<width_tm;i+=2){\
- if ((*datapi!=*datapi_back)){\
- UPDATE_A_UV_PIXEL( yuv_u,\
- yuv_v,\
- t_val,\
- datapi,\
- datapi_next,\
- _ur,_ug,_ubvr,_vg,_vb,\
- __sampling_type,\
- __bit_depth__)\
- ublocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
- vblocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
- }\
- datapi+=2;\
- datapi_back+=2;\
- if(__sampling_type==__PXL_AVERAGE){\
- datapi_next+=2;\
- datapi_back_next+=2;\
- }\
- yuv_u++;\
- yuv_v++;\
- }\
- yuv_u+=(yuv->y_width-width_tm)/2;\
- yuv_v+=(yuv->y_width-width_tm)/2;\
- datapi+=width_tm;\
- datapi_back+=width_tm;\
- if(__sampling_type==__PXL_AVERAGE){\
- datapi_next+=width_tm;\
- datapi_back_next+=width_tm;\
- }\
- }\
- }\
-}
-
-
-#endif
Modified: trunk/recordmydesktop/src/rmd_cache.c
===================================================================
--- trunk/recordmydesktop/src/rmd_cache.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_cache.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,16 +25,17 @@
******************************************************************************/
#include "config.h"
+#include "rmd_cache.h"
-#include <sys/stat.h>
-
+#include "rmd_specsfile.h"
#include "rmd_types.h"
-#include "rmd_cache.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
-#include "rmd_specsfile.h"
-
/**
*Construct an number postfixed name
*
Modified: trunk/recordmydesktop/src/rmd_cache.h
===================================================================
--- trunk/recordmydesktop/src/rmd_cache.h 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_cache.h 2008-12-13 17:20:24 UTC (rev 583)
@@ -29,7 +29,12 @@
#include "rmd_types.h"
+#include <zlib.h>
+#include <stdio.h>
+
+
+
/**
* Change file pointer to a new file while writting
* (file name is incremented with CacheFileN)
Modified: trunk/recordmydesktop/src/rmd_cache_audio.c
===================================================================
--- trunk/recordmydesktop/src/rmd_cache_audio.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_cache_audio.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,13 +25,17 @@
******************************************************************************/
#include "config.h"
+#include "rmd_cache_audio.h"
+#include "rmd_jack.h"
+#include "rmd_types.h"
+
#include <pthread.h>
-#include "rmd_types.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
-#include "rmd_cache_audio.h"
-#include "rmd_jack.h"
void *CacheSoundBuffer(ProgData *pdata){
Modified: trunk/recordmydesktop/src/rmd_cache_frame.c
===================================================================
--- trunk/recordmydesktop/src/rmd_cache_frame.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_cache_frame.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,17 +25,19 @@
******************************************************************************/
#include "config.h"
+#include "rmd_cache_frame.h"
+#include "rmd_yuv_utils.h"
+#include "rmd_cache.h"
+#include "rmd_types.h"
+
#include <signal.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
#include <math.h>
-#include "rmd_types.h"
-#include "rmd_block_utils.h"
-#include "rmd_cache.h"
-#include "rmd_cache_frame.h"
-
-
#define BYTES_PER_MB (1024 * 1024)
#define CACHE_OUT_BUFFER_SIZE (4 * 1024)
#define CACHE_FILE_SIZE_LIMIT (500 * 1024 * 1024)
Modified: trunk/recordmydesktop/src/rmd_capture_sound.c
===================================================================
--- trunk/recordmydesktop/src/rmd_capture_sound.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_capture_sound.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,16 +25,17 @@
******************************************************************************/
#include "config.h"
+#include "rmd_capture_sound.h"
-#include <pthread.h>
-
-#include "rmd_types.h"
-
-#include "rmd_capture_sound.h"
#include "rmd_jack.h"
#include "rmd_opendev.h"
+#include "rmd_types.h"
+#include <pthread.h>
+#include <string.h>
+#include <errno.h>
+
void *CaptureSound(ProgData *pdata){
#ifdef HAVE_LIBASOUND
Modified: trunk/recordmydesktop/src/rmd_encode_cache.c
===================================================================
--- trunk/recordmydesktop/src/rmd_encode_cache.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_encode_cache.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,17 +25,20 @@
******************************************************************************/
#include "config.h"
+#include "rmd_encode_cache.h"
-#include <pthread.h>
-
-#include "rmd_types.h"
-
-#include "rmd_encode_cache.h"
#include "rmd_flush_to_ogg.h"
#include "rmd_init_encoder.h"
#include "rmd_load_cache.h"
+#include "rmd_types.h"
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+
+
void EncodeCache(ProgData *pdata){
pthread_t flush_to_ogg_t,
load_cache_t;
Modified: trunk/recordmydesktop/src/rmd_encode_image_buffer.c
===================================================================
--- trunk/recordmydesktop/src/rmd_encode_image_buffer.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_encode_image_buffer.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,10 +25,11 @@
******************************************************************************/
#include "config.h"
+#include "rmd_encode_image_buffer.h"
#include "rmd_types.h"
-#include "rmd_encode_image_buffer.h"
+#include <errno.h>
void *EncodeImageBuffer(ProgData *pdata){
Modified: trunk/recordmydesktop/src/rmd_encode_sound_buffer.c
===================================================================
--- trunk/recordmydesktop/src/rmd_encode_sound_buffer.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_encode_sound_buffer.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,15 +25,17 @@
******************************************************************************/
#include "config.h"
+#include "rmd_encode_sound_buffer.h"
+#include "rmd_jack.h"
+#include "rmd_types.h"
+
#include <pthread.h>
-#include "rmd_types.h"
+#include <stdlib.h>
+#include <errno.h>
-#include "rmd_encode_sound_buffer.h"
-#include "rmd_jack.h"
-
void *EncodeSoundBuffer(ProgData *pdata){
int sampread=pdata->periodsize;
#ifdef HAVE_LIBJACK
Modified: trunk/recordmydesktop/src/rmd_error.c
===================================================================
--- trunk/recordmydesktop/src/rmd_error.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_error.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,15 +25,16 @@
******************************************************************************/
#include "config.h"
+#include "rmd_error.h"
-#include <stdio.h>
-#include <stdlib.h>
#include <X11/Xlib.h>
#include <X11/Xlibint.h>
-#include "rmd_error.h"
+#include <stdio.h>
+#include <stdlib.h>
+
int rmdErrorHandler( Display *dpy, XErrorEvent *e )
{
char error_desc[1024];
Modified: trunk/recordmydesktop/src/rmd_flush_to_ogg.c
===================================================================
--- trunk/recordmydesktop/src/rmd_flush_to_ogg.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_flush_to_ogg.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,14 +25,18 @@
******************************************************************************/
#include "config.h"
+#include "rmd_flush_to_ogg.h"
+#include "rmd_encode_image_buffer.h"
+#include "rmd_encode_sound_buffer.h"
+#include "rmd_types.h"
+
#include <pthread.h>
-#include "rmd_types.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
-#include "rmd_encode_image_buffer.h"
-#include "rmd_encode_sound_buffer.h"
-#include "rmd_flush_to_ogg.h"
//we copy the page because the next call to ogg_stream_pageout
Modified: trunk/recordmydesktop/src/rmd_frame.c
===================================================================
--- trunk/recordmydesktop/src/rmd_frame.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_frame.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,13 +25,13 @@
******************************************************************************/
#include "config.h"
+#include "rmd_frame.h"
-#include <stdio.h>
-#include <stdlib.h>
#include <X11/Xlib.h>
#include <X11/extensions/shape.h>
-#include "rmd_frame.h"
+#include <stdio.h>
+#include <stdlib.h>
#define BORDER_WIDTH 6
Modified: trunk/recordmydesktop/src/rmd_get_frame.c
===================================================================
--- trunk/recordmydesktop/src/rmd_get_frame.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_get_frame.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,26 +25,26 @@
******************************************************************************/
#include "config.h"
+#include "rmd_get_frame.h"
-#include <limits.h>
-#include <pthread.h>
-#include <sys/shm.h>
-
-#include <X11/extensions/Xfixes.h>
-#include <X11/extensions/XShm.h>
-
-#include "rmd_types.h"
-
#include "rmd_cache.h"
#include "rmd_frame.h"
-#include "rmd_get_frame.h"
#include "rmd_getzpixmap.h"
#include "rmd_poll_events.h"
#include "rmd_rectinsert.h"
#include "rmd_update_image.h"
#include "rmd_yuv_utils.h"
+#include "rmd_types.h"
+#include <X11/extensions/Xfixes.h>
+#include <X11/extensions/XShm.h>
+#include <limits.h>
+#include <pthread.h>
+#include <sys/shm.h>
+#include <errno.h>
+
+
#define AVG_4_PIXELS(data_array,width_img,k_tm,i_tm,offset)\
((data_array[(k_tm*width_img+i_tm)*RMD_ULONG_SIZE_T+offset]+\
data_array[((k_tm-1)*width_img+i_tm)*RMD_ULONG_SIZE_T+offset]+\
Modified: trunk/recordmydesktop/src/rmd_getzpixmap.c
===================================================================
--- trunk/recordmydesktop/src/rmd_getzpixmap.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_getzpixmap.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,17 +25,18 @@
******************************************************************************/
#include "config.h"
+#include "rmd_getzpixmap.h"
+#include "rmd_types.h"
+
+
#include <X11/Xlib.h>
#include <X11/Xlibint.h>
#include <X11/extensions/shmstr.h>
#include <X11/extensions/XShm.h>
-#include "rmd_types.h"
-#include "rmd_getzpixmap.h"
-
int GetZPixmap(Display *dpy,
Window root,
char *data,
Modified: trunk/recordmydesktop/src/rmd_getzpixmap.h
===================================================================
--- trunk/recordmydesktop/src/rmd_getzpixmap.h 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_getzpixmap.h 2008-12-13 17:20:24 UTC (rev 583)
@@ -29,6 +29,7 @@
#include "rmd_types.h"
+#include <X11/extensions/XShm.h>
/**
* Rerieve pixmap data from xserver
Modified: trunk/recordmydesktop/src/rmd_init_encoder.c
===================================================================
--- trunk/recordmydesktop/src/rmd_init_encoder.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_init_encoder.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,16 +25,19 @@
******************************************************************************/
#include "config.h"
+#include "rmd_init_encoder.h"
+#include "rmd_types.h"
+
+#include "skeleton.h"
+
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
-#include "skeleton.h"
-#include "rmd_types.h"
-#include "rmd_init_encoder.h"
static void m_add_fishead_packet(ogg_stream_state *m_ogg_state) {
Modified: trunk/recordmydesktop/src/rmd_initialize_data.c
===================================================================
--- trunk/recordmydesktop/src/rmd_initialize_data.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_initialize_data.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,20 +25,22 @@
******************************************************************************/
#include "config.h"
+#include "rmd_initialize_data.h"
-#include <pthread.h>
-
-#include "rmd_types.h"
-
-#include "rmd_block_utils.h"
#include "rmd_cache.h"
#include "rmd_init_encoder.h"
#include "rmd_jack.h"
#include "rmd_make_dummy_pointer.h"
#include "rmd_opendev.h"
#include "rmd_yuv_utils.h"
+#include "rmd_types.h"
+#include <pthread.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
#ifdef HAVE_LIBASOUND
static void FixBufferSize(snd_pcm_uframes_t *buffsize) {
snd_pcm_uframes_t buffsize_t=*buffsize,
Modified: trunk/recordmydesktop/src/rmd_jack.c
===================================================================
--- trunk/recordmydesktop/src/rmd_jack.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_jack.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,13 +25,13 @@
******************************************************************************/
#include "config.h"
+#include "rmd_jack.h"
-#include <pthread.h>
-
#include "rmd_types.h"
-#include "rmd_jack.h"
+#include <pthread.h>
+#include <string.h>
#ifdef HAVE_LIBJACK
Modified: trunk/recordmydesktop/src/rmd_load_cache.c
===================================================================
--- trunk/recordmydesktop/src/rmd_load_cache.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_load_cache.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,19 +25,22 @@
******************************************************************************/
#include "config.h"
+#include "rmd_load_cache.h"
-#include <pthread.h>
-#include <signal.h>
-
-#include "rmd_types.h"
-
#include "rmd_cache.h"
#include "rmd_encode_image_buffer.h"
#include "rmd_encode_sound_buffer.h"
-#include "rmd_load_cache.h"
#include "rmd_macro.h"
+#include "rmd_types.h"
+#include <pthread.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
//The number of bytes for every
//sub-block of the y,u and v planes.
//Since the blocks are square
Modified: trunk/recordmydesktop/src/rmd_macro.h
===================================================================
--- trunk/recordmydesktop/src/rmd_macro.h 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_macro.h 2008-12-13 17:20:24 UTC (rev 583)
@@ -29,11 +29,11 @@
#include "config.h"
+#include "rmd_types.h"
+
#include <limits.h>
-#include "rmd_types.h"
-
//define which way we are reading a pixmap
#if __BYTE_ORDER == __LITTLE_ENDIAN
#define __ABYTE 3
Modified: trunk/recordmydesktop/src/rmd_make_dummy_pointer.c
===================================================================
--- trunk/recordmydesktop/src/rmd_make_dummy_pointer.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_make_dummy_pointer.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,13 +25,12 @@
******************************************************************************/
#include "config.h"
+#include "rmd_make_dummy_pointer.h"
-#include <X11/Xlib.h>
-
+#include "rmd_macro.h"
#include "rmd_types.h"
-#include "rmd_macro.h"
-#include "rmd_make_dummy_pointer.h"
+#include <X11/Xlib.h>
unsigned char *MakeDummyPointer(Display *display,
Added: trunk/recordmydesktop/src/rmd_math.c
===================================================================
--- trunk/recordmydesktop/src/rmd_math.c (rev 0)
+++ trunk/recordmydesktop/src/rmd_math.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -0,0 +1,36 @@
+/******************************************************************************
+* recordMyDesktop - rmd_math.c *
+*******************************************************************************
+* *
+* Copyright (C) 2008 John Varouhakis *
+* *
+* This program is free software; you can redistribute it and/or modify *
+* it under the terms of the GNU General Public License as published by *
+* the Free Software Foundation; either version 2 of the License, or *
+* (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU General Public License *
+* along with this program; if not, write to the Free Software *
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
+* *
+* *
+* *
+* For further information contact me at joh...@gm... *
+******************************************************************************/
+
+#include "config.h"
+#include "rmd_math.h"
+
+#include <math.h>
+
+double rmdRoundf(double val){
+
+ return val < 0.0 ? ceilf( val - 0.5 ) : floorf( val + 0.5 );
+
+}
+
Added: trunk/recordmydesktop/src/rmd_math.h
===================================================================
--- trunk/recordmydesktop/src/rmd_math.h (rev 0)
+++ trunk/recordmydesktop/src/rmd_math.h 2008-12-13 17:20:24 UTC (rev 583)
@@ -0,0 +1,44 @@
+/******************************************************************************
+* recordMyDesktop - rmd_math.h *
+*******************************************************************************
+* *
+* Copyright (C) 2008 John Varouhakis *
+* *
+* This program is free software; you can redistribute it and/or modify *
+* it under the terms of the GNU General Public License as published by *
+* the Free Software Foundation; either version 2 of the License, or *
+* (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU General Public License *
+* along with this program; if not, write to the Free Software *
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
+* *
+* *
+* *
+* For further information contact me at joh...@gm... *
+******************************************************************************/
+
+#ifndef RMD_MATH_H
+#define RMD_MATH_H 1
+
+/*
+ * Since roundf depends on C99, using it might make
+ * the code non-portable. rmdRoundf solves this
+ * problem, by behaving identically with roundf
+ * and being portable (floorf and ceilf, that are
+ * used in the implementation, are defined in C89)
+ *
+ * \param val Number to be rounded
+ *
+ * \returns val rounded
+ *
+ */
+double rmdRoundf( double val );
+
+#endif
+
Modified: trunk/recordmydesktop/src/rmd_opendev.c
===================================================================
--- trunk/recordmydesktop/src/rmd_opendev.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_opendev.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,12 +25,8 @@
******************************************************************************/
#include "config.h"
+#include "rmd_opendev.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-
#ifdef HAVE_LIBASOUND
#include <alsa/asoundlib.h>
#else
@@ -38,8 +34,12 @@
#include <sys/soundcard.h>
#endif
-#include "rmd_opendev.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+
#ifdef HAVE_LIBASOUND
snd_pcm_t *OpenDev( const char *pcm_dev,
Modified: trunk/recordmydesktop/src/rmd_parseargs.c
===================================================================
--- trunk/recordmydesktop/src/rmd_parseargs.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_parseargs.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,12 +25,15 @@
******************************************************************************/
#include "config.h"
+#include "rmd_parseargs.h"
+#include "rmd_types.h"
+
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
-#include "rmd_types.h"
-
static void PrintConfig(void) {
fprintf(stderr,"\nrecordMyDesktop was compiled with"
" the following options:\n\n");
Modified: trunk/recordmydesktop/src/rmd_poll_events.c
===================================================================
--- trunk/recordmydesktop/src/rmd_poll_events.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_poll_events.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,22 +25,23 @@
******************************************************************************/
#include "config.h"
+#include "rmd_poll_events.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include "rmd_frame.h"
+#include "rmd_macro.h"
+#include "rmd_rectinsert.h"
+#include "rmd_types.h"
+
#include <X11/Xlib.h>
#include <X11/Xlibint.h>
#include <X11/extensions/Xdamage.h>
+
+#include <stdio.h>
+#include <stdlib.h>
#include <signal.h>
#include <pthread.h>
-#include "rmd_frame.h"
-#include "rmd_macro.h"
-#include "rmd_poll_events.h"
-#include "rmd_rectinsert.h"
-#include "rmd_types.h"
-
#define CLIP_EVENT_AREA(e,brwin,xrect){\
if(((e)->area.x<=(brwin)->rrect.x)&&((e)->area.y<=(brwin)->rrect.y)&&\
((e)->area.width>=(brwin)->rrect.width)&&\
Modified: trunk/recordmydesktop/src/rmd_queryextensions.c
===================================================================
--- trunk/recordmydesktop/src/rmd_queryextensions.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_queryextensions.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,16 +25,16 @@
******************************************************************************/
#include "config.h"
+#include "rmd_queryextensions.h"
+#include "rmd_types.h"
+
#include <X11/extensions/shape.h>
#include <X11/extensions/Xfixes.h>
#include <X11/extensions/Xdamage.h>
-#include "rmd_types.h"
-#include "rmd_queryextensions.h"
-
void QueryExtensions(Display *dpy,
ProgArgs *args,
int *damage_event,
Modified: trunk/recordmydesktop/src/rmd_rectinsert.c
===================================================================
--- trunk/recordmydesktop/src/rmd_rectinsert.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_rectinsert.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,11 +25,13 @@
******************************************************************************/
#include "config.h"
+#include "rmd_rectinsert.h"
-#include "rmd_rectinsert.h"
#include "rmd_types.h"
+#include <stdlib.h>
+
/**
* Collide two rectangles and dictate most sane action for insertion,
* as well as provide the updated rectangle(s)
Modified: trunk/recordmydesktop/src/rmd_register_callbacks.c
===================================================================
--- trunk/recordmydesktop/src/rmd_register_callbacks.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_register_callbacks.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,12 +25,11 @@
******************************************************************************/
#include "config.h"
+#include "rmd_register_callbacks.h"
-#include <signal.h>
-
#include "rmd_types.h"
-#include "rmd_register_callbacks.h"
+#include <signal.h>
// There seem to be no way of passing user data to the signal handler,
Modified: trunk/recordmydesktop/src/rmd_rescue.c
===================================================================
--- trunk/recordmydesktop/src/rmd_rescue.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_rescue.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,19 +25,20 @@
******************************************************************************/
#include "config.h"
+#include "rmd_rescue.h"
-#include <pthread.h>
-
-#include "rmd_types.h"
-
-#include "rmd_block_utils.h"
+#include "rmd_yuv_utils.h"
#include "rmd_encode_cache.h"
#include "rmd_initialize_data.h"
#include "rmd_register_callbacks.h"
-#include "rmd_rescue.h"
#include "rmd_specsfile.h"
+#include "rmd_types.h"
+#include <pthread.h>
+#include <string.h>
+
+
int rmdRescue(const char *path){
int i=0,
Modified: trunk/recordmydesktop/src/rmd_setbrwindow.c
===================================================================
--- trunk/recordmydesktop/src/rmd_setbrwindow.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_setbrwindow.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,12 +25,11 @@
******************************************************************************/
#include "config.h"
+#include "rmd_setbrwindow.h"
#include "rmd_types.h"
-#include "rmd_setbrwindow.h"
-
/**
*Align the recording window to a divisible by 2 pixel start and
*and a size divisible by 16.
Modified: trunk/recordmydesktop/src/rmd_shortcuts.c
===================================================================
--- trunk/recordmydesktop/src/rmd_shortcuts.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_shortcuts.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,16 +25,17 @@
******************************************************************************/
#include "config.h"
+#include "rmd_shortcuts.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "rmd_types.h"
+
#include <X11/Xlib.h>
#include <X11/Xlibint.h>
#include <X11/keysym.h>
-#include "rmd_shortcuts.h"
-#include "rmd_types.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
int RegisterShortcut(Display *dpy,
Window root,
Modified: trunk/recordmydesktop/src/rmd_specsfile.c
===================================================================
--- trunk/recordmydesktop/src/rmd_specsfile.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_specsfile.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,14 +25,14 @@
******************************************************************************/
#include "config.h"
+#include "rmd_specsfile.h"
+#include "rmd_types.h"
+
#include <stdlib.h>
#include <stdio.h>
-#include "rmd_specsfile.h"
-#include "rmd_types.h"
-
int WriteSpecsFile(ProgData *pdata){
FILE *fp;
Modified: trunk/recordmydesktop/src/rmd_threads.c
===================================================================
--- trunk/recordmydesktop/src/rmd_threads.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_threads.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,14 +25,8 @@
******************************************************************************/
#include "config.h"
+#include "rmd_threads.h"
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "rmd_types.h"
-
#include "rmd_cache_audio.h"
#include "rmd_cache_frame.h"
#include "rmd_capture_sound.h"
@@ -42,10 +36,15 @@
#include "rmd_get_frame.h"
#include "rmd_jack.h"
#include "rmd_register_callbacks.h"
-#include "rmd_threads.h"
#include "rmd_timer.h"
+#include "rmd_types.h"
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
void rmdThreads(ProgData *pdata){
pthread_t image_capture_t,
image_encode_t,
Modified: trunk/recordmydesktop/src/rmd_timer.c
===================================================================
--- trunk/recordmydesktop/src/rmd_timer.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_timer.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,16 +25,17 @@
******************************************************************************/
#include "config.h"
+#include "rmd_timer.h"
+#include "rmd_types.h"
+
#include <pthread.h>
+
#include <stdio.h>
#include <stdlib.h>
+#include <errno.h>
-#include "rmd_types.h"
-#include "rmd_timer.h"
-
-
void *rmdTimer(ProgData *pdata){
long unsigned int secs_tw=1/pdata->args.fps;
Modified: trunk/recordmydesktop/src/rmd_types.h
===================================================================
--- trunk/recordmydesktop/src/rmd_types.h 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_types.h 2008-12-13 17:20:24 UTC (rev 583)
@@ -27,6 +27,7 @@
#include "config.h"
+#include <stdio.h>
#include <pthread.h>
#include <zlib.h>
#include <X11/Xlib.h>
Modified: trunk/recordmydesktop/src/rmd_update_image.c
===================================================================
--- trunk/recordmydesktop/src/rmd_update_image.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_update_image.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,18 +25,17 @@
******************************************************************************/
#include "config.h"
+#include "rmd_update_image.h"
+#include "rmd_getzpixmap.h"
+#include "rmd_yuv_utils.h"
+#include "rmd_types.h"
+
#include <X11/Xlibint.h>
#include <X11/extensions/shmstr.h>
#include <X11/extensions/XShm.h>
-#include "rmd_types.h"
-#include "rmd_getzpixmap.h"
-#include "rmd_update_image.h"
-#include "rmd_yuv_utils.h"
-
-
void UpdateImage(Display * dpy,
yuv_buffer *yuv,
DisplaySpecs *specs,
Modified: trunk/recordmydesktop/src/rmd_update_image.h
===================================================================
--- trunk/recordmydesktop/src/rmd_update_image.h 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_update_image.h 2008-12-13 17:20:24 UTC (rev 583)
@@ -29,6 +29,7 @@
#include "rmd_types.h"
+#include <X11/extensions/XShm.h>
/**
* Retrieve and apply all changes, if xdamage is used.
Modified: trunk/recordmydesktop/src/rmd_wm_check.c
===================================================================
--- trunk/recordmydesktop/src/rmd_wm_check.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_wm_check.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,14 +25,14 @@
******************************************************************************/
#include "config.h"
+#include "rmd_wm_check.h"
+#include "rmd_types.h"
+
#include <X11/Xatom.h>
-#include "rmd_types.h"
-#include "rmd_wm_check.h"
-
char *rmdWMCheck(Display *dpy,Window root){
Window *wm_child=NULL;
Modified: trunk/recordmydesktop/src/rmd_wm_is_compositing.c
===================================================================
--- trunk/recordmydesktop/src/rmd_wm_is_compositing.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_wm_is_compositing.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,15 +25,16 @@
******************************************************************************/
#include "config.h"
+#include "rmd_wm_is_compositing.h"
+#include "rmd_wm_check.h"
+#include "rmd_types.h"
+
#include <X11/Xatom.h>
-#include "rmd_types.h"
+#include <stdlib.h>
-#include "rmd_wm_check.h"
-#include "rmd_wm_is_compositing.h"
-
boolean rmdWMIsCompositing( Display *dpy, int screen ) {
Window win;
Modified: trunk/recordmydesktop/src/rmd_yuv_utils.c
===================================================================
--- trunk/recordmydesktop/src/rmd_yuv_utils.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_yuv_utils.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -25,14 +25,23 @@
******************************************************************************/
#include "config.h"
-
#include "rmd_yuv_utils.h"
+#include "rmd_math.h"
+
+
// Keep these global (for performance reasons I assume).
unsigned char Yr[256], Yg[256], Yb[256],
Ur[256], Ug[256], UbVr[256],
Vg[256], Vb[256];
+// FIXME: These globals are modified in other source files! We keep
+// thsee here for now. These are the cache blocks. They need to be
+// accesible in the dbuf macros
+u_int32_t *yblocks,
+ *ublocks,
+ *vblocks;
+
void MakeMatrices (void) {
int i;
@@ -68,16 +77,16 @@
for( i = 0 ; i < 256 ; i++ ) {
- Yr[i] = (unsigned char) roundf( Yoffset + yr * i );
- Yg[i] = (unsigned char) roundf( yg * i );
- Yb[i] = (unsigned char) roundf( yb * i );
+ Yr[i] = (unsigned char) rmdRoundf( Yoffset + yr * i );
+ Yg[i] = (unsigned char) rmdRoundf( yg * i );
+ Yb[i] = (unsigned char) rmdRoundf( yb * i );
- Ur[i] = (unsigned char) roundf( Coffset + ur * i );
- Ug[i] = (unsigned char) roundf( ug * i );
- UbVr[i] = (unsigned char) roundf( ub * i );
+ Ur[i] = (unsigned char) rmdRoundf( Coffset + ur * i );
+ Ug[i] = (unsigned char) rmdRoundf( ug * i );
+ UbVr[i] = (unsigned char) rmdRoundf( ub * i );
- Vg[i] = (unsigned char) roundf( vg * i );
- Vb[i] = (unsigned char) roundf( Coffset + vb * i );
+ Vg[i] = (unsigned char) rmdRoundf( vg * i );
+ Vb[i] = (unsigned char) rmdRoundf( Coffset + vb * i );
}
Modified: trunk/recordmydesktop/src/rmd_yuv_utils.h
===================================================================
--- trunk/recordmydesktop/src/rmd_yuv_utils.h 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/rmd_yuv_utils.h 2008-12-13 17:20:24 UTC (rev 583)
@@ -27,7 +27,6 @@
#ifndef YUV_UTILS_H
#define YUV_UTILS_H 1
-#include "rmd_block_utils.h"
#include "rmd_macro.h"
#include "rmd_types.h"
@@ -39,6 +38,15 @@
Vg[256], Vb[256];
+// We keep these global for now. FIXME: Isolate them.
+extern u_int32_t *yblocks,
+ *ublocks,
+ *vblocks;
+
+#define POINT_IN_BLOCK(xv,yv,widthv,blocksize) ((yv/blocksize)*\
+ (widthv/blocksize)+\
+ (xv/blocksize))
+
//when adding the r values, we go beyond
//the (16 bit)range of the t_val variable, but we are performing
//32 bit arithmetics, so there's no problem.
@@ -238,6 +246,131 @@
}\
}
+#define UPDATE_Y_PLANE_DBUF(data,\
+ data_back,\
+ x_tm,\
+ y_tm,\
+ height_tm,\
+ width_tm,\
+ yuv,\
+ __bit_depth__){ \
+ int k,i;\
+ register u_int##__bit_depth__##_t t_val;\
+ register unsigned char *yuv_y=yuv->y+x_tm+y_tm*yuv->y_width,\
+ *_yr=Yr,*_yg=Yg,*_yb=Yb;\
+ register u_int##__bit_depth__##_t *datapi=(u_int##__bit_depth__##_t *)data,\
+ *datapi_back=(u_int##__bit_depth__##_t *)data_back;\
+ for(k=0;k<height_tm;k++){\
+ for(i=0;i<width_tm;i++){\
+ if(*datapi!=*datapi_back){\
+ t_val=*datapi;\
+ *yuv_y=_yr[__RVALUE_##__bit_depth__(t_val)] +\
+ _yg[__GVALUE_##__bit_depth__(t_val)] +\
+ _yb[__BVALUE_##__bit_depth__(t_val)] ;\
+ yblocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
+ }\
+ datapi++;\
+ datapi_back++;\
+ yuv_y++;\
+ }\
+ yuv_y+=yuv->y_width-width_tm;\
+ }\
+}
+
+#define UPDATE_UV_PLANES_DBUF( data,\
+ data_back,\
+ x_tm,\
+ y_tm,\
+ height_tm,\
+ width_tm,\
+ yuv,\
+ __sampling_type,\
+ __bit_depth__){ \
+ int k,i;\
+ register u_int##__bit_depth__##_t t_val;\
+ register unsigned char *yuv_u=yuv->u+x_tm/2+(y_tm*yuv->uv_width)/2,\
+ *yuv_v=yuv->v+x_tm/2+(y_tm*yuv->uv_width)/2,\
+ *_ur=Ur,*_ug=Ug,*_ubvr=UbVr,\
+ *_vg=Vg,*_vb=Vb;\
+ register u_int##__bit_depth__##_t *datapi=(u_int##__bit_depth__##_t *)data,\
+ *datapi_next=NULL,\
+ *datapi_back=(u_int##__bit_depth__##_t *)data_back,\
+ *datapi_back_next=NULL;\
+ if(__sampling_type==__PXL_AVERAGE){\
+ datapi_next=datapi+width_tm;\
+ datapi_back_next=datapi_back+width_tm;\
+ for(k=0;k<height_tm;k+=2){\
+ for(i=0;i<width_tm;i+=2){\
+ if(( (*datapi!=*datapi_back) ||\
+ (*(datapi+1)!=*(datapi_back+1)) ||\
+ (*datapi_next!=*datapi_back_next) ||\
+ (*(datapi_next+1)!=*(datapi_back_next+1)))){\
+ UPDATE_A_UV_PIXEL( yuv_u,\
+ yuv_v,\
+ t_val,\
+ datapi,\
+ datapi_next,\
+ _ur,_ug,_ubvr,_vg,_vb,\
+ __sampling_type,\
+ __bit_depth__)\
+ ublocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
+ vblocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
+ }\
+ datapi+=2;\
+ datapi_back+=2;\
+ if(__sampling_type==__PXL_AVERAGE){\
+ datapi_next+=2;\
+ datapi_back_next+=2;\
+ }\
+ yuv_u++;\
+ yuv_v++;\
+ }\
+ yuv_u+=(yuv->y_width-width_tm)/2;\
+ yuv_v+=(yuv->y_width-width_tm)/2;\
+ datapi+=width_tm;\
+ datapi_back+=width_tm;\
+ if(__sampling_type==__PXL_AVERAGE){\
+ datapi_next+=width_tm;\
+ datapi_back_next+=width_tm;\
+ }\
+ }\
+ }\
+ else{\
+ for(k=0;k<height_tm;k+=2){\
+ for(i=0;i<width_tm;i+=2){\
+ if ((*datapi!=*datapi_back)){\
+ UPDATE_A_UV_PIXEL( yuv_u,\
+ yuv_v,\
+ t_val,\
+ datapi,\
+ datapi_next,\
+ _ur,_ug,_ubvr,_vg,_vb,\
+ __sampling_type,\
+ __bit_depth__)\
+ ublocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
+ vblocks[POINT_IN_BLOCK(i,k,width_tm,Y_UNIT_WIDTH)]=1;\
+ }\
+ datapi+=2;\
+ datapi_back+=2;\
+ if(__sampling_type==__PXL_AVERAGE){\
+ datapi_next+=2;\
+ datapi_back_next+=2;\
+ }\
+ yuv_u++;\
+ yuv_v++;\
+ }\
+ yuv_u+=(yuv->y_width-width_tm)/2;\
+ yuv_v+=(yuv->y_width-width_tm)/2;\
+ datapi+=width_tm;\
+ datapi_back+=width_tm;\
+ if(__sampling_type==__PXL_AVERAGE){\
+ datapi_next+=width_tm;\
+ datapi_back_next+=width_tm;\
+ }\
+ }\
+ }\
+}
+
/**
* Fill Yr,Yg,Yb,Ur,Ug.Ub,Vr,Vg,Vb arrays(globals) with values.
*/
Modified: trunk/recordmydesktop/src/skeleton.h
===================================================================
--- trunk/recordmydesktop/src/skeleton.h 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/skeleton.h 2008-12-13 17:20:24 UTC (rev 583)
@@ -10,6 +10,7 @@
extern "C" {
#endif
+#include <stdio.h>
#include <ogg/ogg.h>
#define SKELETON_VERSION_MAJOR 3
Modified: trunk/recordmydesktop/src/test-rectinsert-data.c
===================================================================
--- trunk/recordmydesktop/src/test-rectinsert-data.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/test-rectinsert-data.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -21,9 +21,9 @@
******************************************************************************/
#include "config.h"
+#include "test-rectinsert-data.h"
#include "test-rectinsert-types.h"
-#include "test-rectinsert-data.h"
// Defines to increase readability of test data
Modified: trunk/recordmydesktop/src/test-rectinsert.c
===================================================================
--- trunk/recordmydesktop/src/test-rectinsert.c 2008-11-23 15:51:26 UTC (rev 582)
+++ trunk/recordmydesktop/src/test-rectinsert.c 2008-12-13 17:20:24 UTC (rev 583)
@@ -21,14 +21,14 @@
******************************************************************************/
#include "config.h"
-
-#include "rmd_types.h"
#include "rmd_rectinsert.h"
#include "test-rectinsert-types.h"
#include "test-rectinsert-data.h"
+#include "rmd_types.h"
+
static void SetPixel(boolean *state, int x, int y, boolean value) {
int index = y * STATE_WIDTH + x;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2008-11-23 15:51:30
|
Revision: 582
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=582&view=rev
Author: iovar
Date: 2008-11-23 15:51:26 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
tagging release 0.3.8 for [qt/gtk]-recordMyDesktop
Added Paths:
-----------
tags/v_0_3_8/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2008-11-23 15:05:41
|
Revision: 581
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=581&view=rev
Author: iovar
Date: 2008-11-23 15:05:38 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
ChangeLog entries and version changes in configure.ac,
for 0.3.8 release ([qt/gtk]-recordMyDesktop)
Modified Paths:
--------------
trunk/gtk-recordmydesktop/ChangeLog
trunk/gtk-recordmydesktop/configure.ac
trunk/qt-recordmydesktop/ChangeLog
trunk/qt-recordmydesktop/configure.ac
trunk/recordmydesktop/ChangeLog
trunk/recordmydesktop/configure.ac
Modified: trunk/gtk-recordmydesktop/ChangeLog
===================================================================
--- trunk/gtk-recordmydesktop/ChangeLog 2008-11-22 16:39:04 UTC (rev 580)
+++ trunk/gtk-recordmydesktop/ChangeLog 2008-11-23 15:05:38 UTC (rev 581)
@@ -1,3 +1,9 @@
+/*VERSION 0.3.8*/
+* nl.po added Dutch translation by Jos Poortvliet
+* Applied patch by freedo, to Replace GtkFileSelection with
+GtkFileChooserDialog.
+* Synced to recordMyDesktop 0.3.8 (new format of options).
+
/*VERSION 0.3.7.2*/
*Updated Polish translation by Paweł Smoliński
*Added button/dialog for workdir selection.
Modified: trunk/gtk-recordmydesktop/configure.ac
===================================================================
--- trunk/gtk-recordmydesktop/configure.ac 2008-11-22 16:39:04 UTC (rev 580)
+++ trunk/gtk-recordmydesktop/configure.ac 2008-11-23 15:05:38 UTC (rev 581)
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
-AC_INIT([gtk-recordmydesktop], [0.3.7.2])
+AC_INIT([gtk-recordmydesktop], [0.3.8])
AM_INIT_AUTOMAKE
AS_AC_EXPAND(LIBDIR, $libdir)
Modified: trunk/qt-recordmydesktop/ChangeLog
===================================================================
--- trunk/qt-recordmydesktop/ChangeLog 2008-11-22 16:39:04 UTC (rev 580)
+++ trunk/qt-recordmydesktop/ChangeLog 2008-11-23 15:05:38 UTC (rev 581)
@@ -1,3 +1,9 @@
+/*VERSION 0.3.8*/
+* Changed qt-recordMyDesktop's license to GPLV3 .
+* nl.po added Dutch translation by Jos Poortvliet
+* Oxygen icons are now used for record/pause/stop actions.
+* Synced to recordMyDesktop 0.3.8 (new format of options).
+
/*VERSION 0.3.7.2*/
*Updated Polish translation by Paweł Smoliński
Modified: trunk/qt-recordmydesktop/configure.ac
===================================================================
--- trunk/qt-recordmydesktop/configure.ac 2008-11-22 16:39:04 UTC (rev 580)
+++ trunk/qt-recordmydesktop/configure.ac 2008-11-23 15:05:38 UTC (rev 581)
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
-AC_INIT([qt-recordmydesktop], [0.3.8-svn])
+AC_INIT([qt-recordmydesktop], [0.3.8])
AM_INIT_AUTOMAKE
AS_AC_EXPAND(LIBDIR, $libdir)
Modified: trunk/recordmydesktop/ChangeLog
===================================================================
--- trunk/recordmydesktop/ChangeLog 2008-11-22 16:39:04 UTC (rev 580)
+++ trunk/recordmydesktop/ChangeLog 2008-11-23 15:05:38 UTC (rev 581)
@@ -1,3 +1,18 @@
+/*Version 0.3.8*/
+* Extensive refactoring and cleanups of the code from Martin Nordholts.
+* Cursor-flickering bug has been fixed, by Martin.
+* Improved consistency on the format of the commandline options
+and updated the manpage to reflect the changes (also by Martin ;) ).
+* Applied patch by Luca Bonavita, that corrects the rgb
+to yuv algorithm and provides near perfect colorspace conversion
+(fixes bug #1961505)
+* Compositing Window managers are now recognised through the _NET_WM_CM_Sn
+hint instead of a simplistic namelist (which means that dual-mode wm's like
+kwin or yet uknown ones will be handled correctly).
+* Changed the way Jack support is offered, from dlopening at runtime to normal
+linking at compilation.
+* other minor changes and bugfixes.
+
/*Version 0.3.7.3*/
* Fixed bug #1886713 (XCB related crash)
Modified: trunk/recordmydesktop/configure.ac
===================================================================
--- trunk/recordmydesktop/configure.ac 2008-11-22 16:39:04 UTC (rev 580)
+++ trunk/recordmydesktop/configure.ac 2008-11-23 15:05:38 UTC (rev 581)
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT( [recordmydesktop], [0.3.7.3], )
+AC_INIT( [recordmydesktop], [0.3.8], )
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/rmd.c])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2008-11-22 16:39:12
|
Revision: 580
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=580&view=rev
Author: iovar
Date: 2008-11-22 16:39:04 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
src/rmd_cache.c, src/rmd_cache_frame.c, src/rmd_get_frame.c,
src/rmd_init_encoder.c, src/rmd_poll_events.c, src/rmd_rectinsert.c,
src/rmd_rectinsert.h, src/rmd_rescue.c, src/rmd_setbrwindow.c,
src/rmd_specsfile.c, src/rmd_types.h, src/rmd_update_image.c,
src/test-rectinsert-data.c, src/test-rectinsert-types.h, src/test-rectinsert.c:
Replaced the custom WGeometry struct-type with the Xlib-provided XRectangle type.
Since XRectangle has unsigned width and height, any places in the code where
-1 was used in these members of WGeometry to denote invalid rects, where changed
to 0 ( zero width or height rects are also considered invalid, wherever met).
Also, the following variable renames happened : wgeom => xrect, rgeom => rrect,
geom => rect and so on. Some other minor changes in this commit are all related
to this type change and also the fact that WGeometry had members of type int,
while XRectangle is comprised of short members.
Modified Paths:
--------------
trunk/recordmydesktop/src/rmd_cache.c
trunk/recordmydesktop/src/rmd_cache_frame.c
trunk/recordmydesktop/src/rmd_get_frame.c
trunk/recordmydesktop/src/rmd_init_encoder.c
trunk/recordmydesktop/src/rmd_poll_events.c
trunk/recordmydesktop/src/rmd_rectinsert.c
trunk/recordmydesktop/src/rmd_rectinsert.h
trunk/recordmydesktop/src/rmd_rescue.c
trunk/recordmydesktop/src/rmd_setbrwindow.c
trunk/recordmydesktop/src/rmd_specsfile.c
trunk/recordmydesktop/src/rmd_types.h
trunk/recordmydesktop/src/rmd_update_image.c
trunk/recordmydesktop/src/test-rectinsert-data.c
trunk/recordmydesktop/src/test-rectinsert-types.h
trunk/recordmydesktop/src/test-rectinsert.c
Modified: trunk/recordmydesktop/src/rmd_cache.c
===================================================================
--- trunk/recordmydesktop/src/rmd_cache.c 2008-11-22 15:58:54 UTC (rev 579)
+++ trunk/recordmydesktop/src/rmd_cache.c 2008-11-22 16:39:04 UTC (rev 580)
@@ -132,10 +132,10 @@
//we set the buffer only since there's
//no need to initialize the encoder from now.
- width=((pdata->brwin.rgeom.width + 15) >>4)<<4;
- height=((pdata->brwin.rgeom.height + 15) >>4)<<4;
- offset_x=((width-pdata->brwin.rgeom.width)/2)&~1;
- offset_y=((height-pdata->brwin.rgeom.height)/2)&~1;
+ width=((pdata->brwin.rrect.width + 15) >>4)<<4;
+ height=((pdata->brwin.rrect.height + 15) >>4)<<4;
+ offset_x=((width-pdata->brwin.rrect.width)/2)&~1;
+ offset_y=((height-pdata->brwin.rrect.height)/2)&~1;
(pdata)->enc_data=enc_data_t;
Modified: trunk/recordmydesktop/src/rmd_cache_frame.c
===================================================================
--- trunk/recordmydesktop/src/rmd_cache_frame.c 2008-11-22 15:58:54 UTC (rev 579)
+++ trunk/recordmydesktop/src/rmd_cache_frame.c 2008-11-22 16:39:04 UTC (rev 580)
@@ -266,7 +266,7 @@
{
unsigned int bytes_per_pixel = pdata->specs.depth >= 24 ? 4 : 2;
- unsigned int pixels_per_frame = pdata->brwin.rgeom.width * pdata->brwin.rgeom.height;
+ unsigned int pixels_per_frame = pdata->brwin.rrect.width * pdata->brwin.rrect.height;
total_received_bytes = ((unsigned int)frameno) * bytes_per_pixel * pixels_per_frame;
}
Modified: trunk/recordmydesktop/src/rmd_get_frame.c
===================================================================
--- trunk/recordmydesktop/src/rmd_get_frame.c 2008-11-22 15:58:54 UTC (rev 579)
+++ trunk/recordmydesktop/src/rmd_get_frame.c 2008-11-22 16:39:04 UTC (rev 580)
@@ -51,41 +51,41 @@
data_array[(k_tm*width_img+i_tm-1)*RMD_ULONG_SIZE_T+offset]+\
data_array[((k_tm-1)*width_img+i_tm-1)*RMD_ULONG_SIZE_T+offset])/4)
-#define CLIP_DUMMY_POINTER_AREA(dummy_p_area,brwin,wgeom){\
- (wgeom)->x=((((dummy_p_area).x+\
- (dummy_p_area).width>=(brwin)->rgeom.x)&&\
- ((dummy_p_area).x<=(brwin)->rgeom.x+\
- (brwin)->rgeom.width))?\
- (((dummy_p_area).x<=(brwin)->rgeom.x)?\
- (brwin)->rgeom.x:(dummy_p_area).x):-1);\
- (wgeom)->y=((((dummy_p_area).y+\
- (dummy_p_area).height>=(brwin)->rgeom.y)&&\
- ((dummy_p_area).y<=(brwin)->rgeom.y+\
- (brwin)->rgeom.height))?\
- (((dummy_p_area).y<=(brwin)->rgeom.y)?\
- (brwin)->rgeom.y:(dummy_p_area).y):-1);\
- (wgeom)->width=((dummy_p_area).x<=(brwin)->rgeom.x)?\
+#define CLIP_DUMMY_POINTER_AREA(dummy_p_area,brwin,xrect){\
+ (xrect)->x=((((dummy_p_area).x+\
+ (dummy_p_area).width>=(brwin)->rrect.x)&&\
+ ((dummy_p_area).x<=(brwin)->rrect.x+\
+ (brwin)->rrect.width))?\
+ (((dummy_p_area).x<=(brwin)->rrect.x)?\
+ (brwin)->rrect.x:(dummy_p_area).x):-1);\
+ (xrect)->y=((((dummy_p_area).y+\
+ (dummy_p_area).height>=(brwin)->rrect.y)&&\
+ ((dummy_p_area).y<=(brwin)->rrect.y+\
+ (brwin)->rrect.height))?\
+ (((dummy_p_area).y<=(brwin)->rrect.y)?\
+ (brwin)->rrect.y:(dummy_p_area).y):-1);\
+ (xrect)->width=((dummy_p_area).x<=(brwin)->rrect.x)?\
(dummy_p_area).width-\
- ((brwin)->rgeom.x-(dummy_p_area).x):\
- ((dummy_p_area).x<=(brwin)->rgeom.x+\
- (brwin)->rgeom.width)?\
- ((brwin)->rgeom.width-(dummy_p_area).x+\
- (brwin)->rgeom.x<(dummy_p_area).width)?\
- (brwin)->rgeom.width-(dummy_p_area).x+\
- (brwin)->rgeom.x:(dummy_p_area).width:-1;\
- (wgeom)->height=((dummy_p_area).y<=(brwin)->rgeom.y)?\
+ ((brwin)->rrect.x-(dummy_p_area).x):\
+ ((dummy_p_area).x<=(brwin)->rrect.x+\
+ (brwin)->rrect.width)?\
+ ((brwin)->rrect.width-(dummy_p_area).x+\
+ (brwin)->rrect.x<(dummy_p_area).width)?\
+ (brwin)->rrect.width-(dummy_p_area).x+\
+ (brwin)->rrect.x:(dummy_p_area).width:0;\
+ (xrect)->height=((dummy_p_area).y<=(brwin)->rrect.y)?\
(dummy_p_area).height-\
- ((brwin)->rgeom.y-(dummy_p_area).y):\
- ((dummy_p_area).y<=(brwin)->rgeom.y+\
- (brwin)->rgeom.height)?\
- ((brwin)->rgeom.height-(dummy_p_area).y+\
- (brwin)->rgeom.y<(dummy_p_area).height)?\
- (brwin)->rgeom.height-(dummy_p_area).y+\
- (brwin)->rgeom.y:(dummy_p_area).height:-1;\
- if((wgeom)->width>(brwin)->rgeom.width)\
- (wgeom)->width=(brwin)->rgeom.width;\
- if((wgeom)->height>(brwin)->rgeom.height)\
- (wgeom)->height=(brwin)->rgeom.height;\
+ ((brwin)->rrect.y-(dummy_p_area).y):\
+ ((dummy_p_area).y<=(brwin)->rrect.y+\
+ (brwin)->rrect.height)?\
+ ((brwin)->rrect.height-(dummy_p_area).y+\
+ (brwin)->rrect.y<(dummy_p_area).height)?\
+ (brwin)->rrect.height-(dummy_p_area).y+\
+ (brwin)->rrect.y:(dummy_p_area).height:0;\
+ if((xrect)->width>(brwin)->rrect.width)\
+ (xrect)->width=(brwin)->rrect.width;\
+ if((xrect)->height>(brwin)->rrect.height)\
+ (xrect)->height=(brwin)->rrect.height;\
}
#define XFIXES_POINTER_TO_YUV(yuv,\
@@ -210,17 +210,17 @@
ZPixmap,
0,
*pxl_data,
- pdata->brwin.rgeom.width,
- pdata->brwin.rgeom.height,
+ pdata->brwin.rrect.width,
+ pdata->brwin.rrect.height,
8,
0);
XInitImage((*image));
GetZPixmap(pdata->dpy,pdata->specs.root,
(*image)->data,
- pdata->brwin.rgeom.x,
- pdata->brwin.rgeom.y,
- pdata->brwin.rgeom.width,
- pdata->brwin.rgeom.height);
+ pdata->brwin.rrect.x,
+ pdata->brwin.rrect.y,
+ pdata->brwin.rrect.width,
+ pdata->brwin.rrect.height);
}
else{
(*image)=XShmCreateImage(pdata->dpy,
@@ -229,8 +229,8 @@
ZPixmap,
*pxl_data,
shminfo,
- pdata->brwin.rgeom.width,
- pdata->brwin.rgeom.height);
+ pdata->brwin.rrect.width,
+ pdata->brwin.rrect.height);
(*shminfo).shmid=shmget(IPC_PRIVATE,
(*image)->bytes_per_line*
(*image)->height,
@@ -249,15 +249,15 @@
XShmGetImage(pdata->dpy,
pdata->specs.root,
(*image),
- pdata->brwin.rgeom.x,
- pdata->brwin.rgeom.y,
+ pdata->brwin.rrect.x,
+ pdata->brwin.rrect.y,
AllPlanes);
}
UPDATE_YUV_BUFFER((&pdata->enc_data->yuv),
((unsigned char*)((*image))->data),NULL,
(pdata->enc_data->x_offset),(pdata->enc_data->y_offset),
- (pdata->brwin.rgeom.width),(pdata->brwin.rgeom.height),
+ (pdata->brwin.rrect.width),(pdata->brwin.rrect.height),
(pdata->args.no_quick_subsample),
pdata->specs.depth);
@@ -267,14 +267,14 @@
//make a deep copy
static void BRWinCpy(BRWindow *target, BRWindow *source) {
- target->geom.x=source->geom.x;
- target->geom.y=source->geom.y;
- target->geom.width=source->geom.width;
- target->geom.height=source->geom.height;
- target->rgeom.x=source->rgeom.x;
- target->rgeom.y=source->rgeom.y;
- target->rgeom.width=source->rgeom.width;
- target->rgeom.height=source->rgeom.height;
+ target->rect.x=source->rect.x;
+ target->rect.y=source->rect.y;
+ target->rect.width=source->rect.width;
+ target->rect.height=source->rect.height;
+ target->rrect.x=source->rrect.x;
+ target->rrect.y=source->rrect.y;
+ target->rrect.width=source->rrect.width;
+ target->rrect.height=source->rrect.height;
target->nbytes=source->nbytes;
target->windowid=source->windowid;
@@ -289,14 +289,14 @@
int height) {
int t_x=0,t_y=0;
- t_x=cursor_x-brwin->rgeom.width/2;
+ t_x=cursor_x-brwin->rrect.width/2;
t_x=(t_x>>1)<<1;
- brwin->rgeom.x=(t_x<0)?0:((t_x+brwin->rgeom.width>width)?
- width-brwin->rgeom.width:t_x);
- t_y=cursor_y-brwin->rgeom.height/2;
+ brwin->rrect.x=(t_x<0)?0:((t_x+brwin->rrect.width>width)?
+ width-brwin->rrect.width:t_x);
+ t_y=cursor_y-brwin->rrect.height/2;
t_y=(t_y>>1)<<1;
- brwin->rgeom.y=(t_y<0)?0:((t_y+brwin->rgeom.height>height)?
- height-brwin->rgeom.height:t_y);
+ brwin->rrect.y=(t_y<0)?0:((t_y+brwin->rrect.height>height)?
+ height-brwin->rrect.height:t_y);
}
/**
@@ -335,10 +335,10 @@
while (temp != NULL) {
- column_start = (temp->geom.x - x_offset) / Y_UNIT_WIDTH;
- column_end = (temp->geom.x + (temp->geom.width - 1) - x_offset) / Y_UNIT_WIDTH;
- row_start = (temp->geom.y - y_offset) / Y_UNIT_WIDTH;
- row_end = (temp->geom.y + (temp->geom.height - 1) - y_offset) / Y_UNIT_WIDTH;
+ column_start = (temp->rect.x - x_offset) / Y_UNIT_WIDTH;
+ column_end = (temp->rect.x + (temp->rect.width - 1) - x_offset) / Y_UNIT_WIDTH;
+ row_start = (temp->rect.y - y_offset) / Y_UNIT_WIDTH;
+ row_end = (temp->rect.y + (temp->rect.height - 1) - y_offset) / Y_UNIT_WIDTH;
for (i = row_start; i < row_end + 1; i++) {
for (j = column_start; j < column_end + 1; j++) {
@@ -358,7 +358,7 @@
blocknum_x=pdata->enc_data->yuv.y_width/Y_UNIT_WIDTH,
blocknum_y=pdata->enc_data->yuv.y_height/Y_UNIT_WIDTH;
unsigned int msk_ret;
- WGeometry mouse_pos_abs,mouse_pos_rel,mouse_pos_temp;
+ XRectangle mouse_pos_abs,mouse_pos_rel,mouse_pos_temp;
BRWindow temp_brwin;
Window root_ret,
child_ret; //Frame
@@ -414,10 +414,10 @@
pdata->shaped_w=rmdFrameInit(pdata->dpy,
pdata->specs.screen,
pdata->specs.root,
- pdata->brwin.rgeom.x,
- pdata->brwin.rgeom.y,
- pdata->brwin.rgeom.width,
- pdata->brwin.rgeom.height);
+ pdata->brwin.rrect.x,
+ pdata->brwin.rrect.y,
+ pdata->brwin.rrect.width,
+ pdata->brwin.rrect.height);
XSelectInput(pdata->dpy,pdata->shaped_w,ExposureMask);
}
@@ -486,8 +486,8 @@
XQueryPointer(pdata->dpy,
pdata->specs.root,
&root_ret,&child_ret,
- &mouse_pos_abs.x,&mouse_pos_abs.y,
- &mouse_pos_rel.x,&mouse_pos_rel.y,&msk_ret);
+ (int *)&mouse_pos_abs.x,(int *)&mouse_pos_abs.y,
+ (int *)&mouse_pos_rel.x,(int *)&mouse_pos_rel.y,&msk_ret);
}
CLIP_DUMMY_POINTER_AREA(mouse_pos_abs, &temp_brwin, &mouse_pos_temp);
@@ -518,14 +518,14 @@
MARK_BUFFER_AREA( back_buff,
(mouse_pos_temp.x-
- temp_brwin.rgeom.x+
+ temp_brwin.rrect.x+
pdata->enc_data->x_offset),
(mouse_pos_temp.y-
- temp_brwin.rgeom.y+
+ temp_brwin.rrect.y+
pdata->enc_data->y_offset),
mouse_pos_temp.width,
mouse_pos_temp.height,
- (temp_brwin.rgeom.width),
+ (temp_brwin.rrect.width),
pdata->specs.depth)
}
}
@@ -541,8 +541,8 @@
if(!pdata->args.noframe){
rmdMoveFrame(pdata->dpy,
pdata->shaped_w,
- temp_brwin.rgeom.x,
- temp_brwin.rgeom.y);
+ temp_brwin.rrect.x,
+ temp_brwin.rrect.y);
}
}
@@ -561,8 +561,8 @@
pdata->shm_opcode,
pdata->args.no_quick_subsample);
BlocksFromList(&pdata->rect_root,
- temp_brwin.rgeom.x,
- temp_brwin.rgeom.y,
+ temp_brwin.rrect.x,
+ temp_brwin.rrect.y,
pdata->enc_data->yuv.y_width/Y_UNIT_WIDTH,
pdata->enc_data->yuv.y_height/Y_UNIT_WIDTH);
pthread_mutex_unlock(&pdata->yuv_mutex);
@@ -577,17 +577,17 @@
if(!pdata->args.noshared){
XShmGetImage(pdata->dpy,pdata->specs.root,
((!img_sel)?image:image_back),
- (temp_brwin.rgeom.x),
- (temp_brwin.rgeom.y),AllPlanes);
+ (temp_brwin.rrect.x),
+ (temp_brwin.rrect.y),AllPlanes);
}
if(pdata->args.noshared){
GetZPixmap( pdata->dpy,
pdata->specs.root,
image->data,
- temp_brwin.rgeom.x,
- temp_brwin.rgeom.y,
- temp_brwin.rgeom.width,
- temp_brwin.rgeom.height);
+ temp_brwin.rrect.x,
+ temp_brwin.rrect.y,
+ temp_brwin.rrect.width,
+ temp_brwin.rrect.height);
}
pthread_mutex_lock(&pdata->yuv_mutex);
for(i=0;i<blocknum_x*blocknum_y;i++){
@@ -597,8 +597,8 @@
front_buff,back_buff,
(pdata->enc_data->x_offset),
(pdata->enc_data->y_offset),
- (temp_brwin.rgeom.width),
- (temp_brwin.rgeom.height),
+ (temp_brwin.rrect.width),
+ (temp_brwin.rrect.height),
pdata->args.no_quick_subsample,
pdata->specs.depth);
pthread_mutex_unlock(&pdata->yuv_mutex);
@@ -625,10 +625,10 @@
XFIXES_POINTER_TO_YUV((&pdata->enc_data->yuv),
((unsigned char*)xcim->pixels),
(mouse_pos_temp.x-
- temp_brwin.rgeom.x+
+ temp_brwin.rrect.x+
pdata->enc_data->x_offset),
(mouse_pos_temp.y-
- temp_brwin.rgeom.y+
+ temp_brwin.rrect.y+
pdata->enc_data->y_offset),
mouse_pos_temp.width,
mouse_pos_temp.height,
@@ -640,10 +640,10 @@
DUMMY_POINTER_TO_YUV((&pdata->enc_data->yuv),
pdata->dummy_pointer,
(mouse_pos_temp.x-
- temp_brwin.rgeom.x+
+ temp_brwin.rrect.x+
pdata->enc_data->x_offset),
(mouse_pos_temp.y-
- temp_brwin.rgeom.y+
+ temp_brwin.rrect.y+
pdata->enc_data->y_offset),
mouse_pos_temp.width,
mouse_pos_temp.height,
@@ -662,14 +662,14 @@
MARK_BUFFER_AREA( front_buff,
(mouse_pos_temp.x-
- temp_brwin.rgeom.x+
+ temp_brwin.rrect.x+
pdata->enc_data->x_offset),
(mouse_pos_temp.y-
- temp_brwin.rgeom.y+
+ temp_brwin.rrect.y+
pdata->enc_data->y_offset),
mouse_pos_temp.width,
mouse_pos_temp.height,
- (temp_brwin.rgeom.width),
+ (temp_brwin.rrect.width),
pdata->specs.depth)
}
Modified: trunk/recordmydesktop/src/rmd_init_encoder.c
===================================================================
--- trunk/recordmydesktop/src/rmd_init_encoder.c 2008-11-22 15:58:54 UTC (rev 579)
+++ trunk/recordmydesktop/src/rmd_init_encoder.c 2008-11-22 16:39:04 UTC (rev 580)
@@ -159,8 +159,8 @@
theora_info_init(&enc_data_t->m_th_inf);
- enc_data_t->m_th_inf.frame_width = pdata->brwin.rgeom.width;
- enc_data_t->m_th_inf.frame_height = pdata->brwin.rgeom.height;
+ enc_data_t->m_th_inf.frame_width = pdata->brwin.rrect.width;
+ enc_data_t->m_th_inf.frame_height = pdata->brwin.rrect.height;
enc_data_t->m_th_inf.width = ((enc_data_t->m_th_inf.frame_width + 15) >> 4) << 4;
enc_data_t->m_th_inf.height = ((enc_data_t->m_th_inf.frame_height + 15) >> 4) << 4;
enc_data_t->m_th_inf.offset_x = 0;
Modified: trunk/recordmydesktop/src/rmd_poll_events.c
===================================================================
--- trunk/recordmydesktop/src/rmd_poll_events.c 2008-11-22 15:58:54 UTC (rev 579)
+++ trunk/recordmydesktop/src/rmd_poll_events.c 2008-11-22 16:39:04 UTC (rev 580)
@@ -41,42 +41,42 @@
#include "rmd_types.h"
-#define CLIP_EVENT_AREA(e,brwin,wgeom){\
- if(((e)->area.x<=(brwin)->rgeom.x)&&((e)->area.y<=(brwin)->rgeom.y)&&\
- ((e)->area.width>=(brwin)->rgeom.width)&&\
- ((e)->area.height<(brwin)->rgeom.height)){\
- (wgeom)->x=(brwin)->rgeom.x;\
- (wgeom)->y=(brwin)->rgeom.y;\
- (wgeom)->width=(brwin)->rgeom.width;\
- (wgeom)->height=(brwin)->rgeom.height;\
+#define CLIP_EVENT_AREA(e,brwin,xrect){\
+ if(((e)->area.x<=(brwin)->rrect.x)&&((e)->area.y<=(brwin)->rrect.y)&&\
+ ((e)->area.width>=(brwin)->rrect.width)&&\
+ ((e)->area.height<(brwin)->rrect.height)){\
+ (xrect)->x=(brwin)->rrect.x;\
+ (xrect)->y=(brwin)->rrect.y;\
+ (xrect)->width=(brwin)->rrect.width;\
+ (xrect)->height=(brwin)->rrect.height;\
}\
else{\
- (wgeom)->x=((((e)->area.x+(e)->area.width>=(brwin)->rgeom.x)&&\
- ((e)->area.x<=(brwin)->rgeom.x+(brwin)->rgeom.width))?\
- (((e)->area.x<=(brwin)->rgeom.x)?(brwin)->rgeom.x:(e)->area.x):-1);\
+ (xrect)->x=((((e)->area.x+(e)->area.width>=(brwin)->rrect.x)&&\
+ ((e)->area.x<=(brwin)->rrect.x+(brwin)->rrect.width))?\
+ (((e)->area.x<=(brwin)->rrect.x)?(brwin)->rrect.x:(e)->area.x):-1);\
\
- (wgeom)->y=((((e)->area.y+(e)->area.height>=(brwin)->rgeom.y)&&\
- ((e)->area.y<=(brwin)->rgeom.y+(brwin)->rgeom.height))?\
- (((e)->area.y<=(brwin)->rgeom.y)?(brwin)->rgeom.y:(e)->area.y):-1);\
+ (xrect)->y=((((e)->area.y+(e)->area.height>=(brwin)->rrect.y)&&\
+ ((e)->area.y<=(brwin)->rrect.y+(brwin)->rrect.height))?\
+ (((e)->area.y<=(brwin)->rrect.y)?(brwin)->rrect.y:(e)->area.y):-1);\
\
- (wgeom)->width=((e)->area.x<=(brwin)->rgeom.x)?\
- (e)->area.width-((brwin)->rgeom.x-(e)->area.x):\
- ((e)->area.x<=(brwin)->rgeom.x+(brwin)->rgeom.width)?\
- (((brwin)->rgeom.width-(e)->area.x+(brwin)->rgeom.x<(e)->area.width)?\
- (brwin)->rgeom.width-(e)->area.x+(brwin)->rgeom.x:e->area.width):-1;\
+ (xrect)->width=((e)->area.x<=(brwin)->rrect.x)?\
+ (e)->area.width-((brwin)->rrect.x-(e)->area.x):\
+ ((e)->area.x<=(brwin)->rrect.x+(brwin)->rrect.width)?\
+ (((brwin)->rrect.width-(e)->area.x+(brwin)->rrect.x<(e)->area.width)?\
+ (brwin)->rrect.width-(e)->area.x+(brwin)->rrect.x:e->area.width):0;\
\
- (wgeom)->height=((e)->area.y<=(brwin)->rgeom.y)?\
- (e)->area.height-((brwin)->rgeom.y-(e)->area.y):\
- ((e)->area.y<=(brwin)->rgeom.y+(brwin)->rgeom.height)?\
- (((brwin)->rgeom.height-(e)->area.y+\
- (brwin)->rgeom.y<(e)->area.height)?\
- (brwin)->rgeom.height-(e)->area.y+\
- (brwin)->rgeom.y:(e)->area.height):-1;\
+ (xrect)->height=((e)->area.y<=(brwin)->rrect.y)?\
+ (e)->area.height-((brwin)->rrect.y-(e)->area.y):\
+ ((e)->area.y<=(brwin)->rrect.y+(brwin)->rrect.height)?\
+ (((brwin)->rrect.height-(e)->area.y+\
+ (brwin)->rrect.y<(e)->area.height)?\
+ (brwin)->rrect.height-(e)->area.y+\
+ (brwin)->rrect.y:(e)->area.height):0;\
\
- if((wgeom)->width>(brwin)->rgeom.width)\
- (wgeom)->width=(brwin)->rgeom.width;\
- if((wgeom)->height>(brwin)->rgeom.height)\
- (wgeom)->height=(brwin)->rgeom.height;\
+ if((xrect)->width>(brwin)->rrect.width)\
+ (xrect)->width=(brwin)->rrect.width;\
+ if((xrect)->height>(brwin)->rrect.height)\
+ (xrect)->height=(brwin)->rrect.height;\
}\
}
@@ -167,8 +167,8 @@
rmdDrawFrame(pdata->dpy,
pdata->specs.screen,
pdata->shaped_w,
- pdata->brwin.rgeom.width,
- pdata->brwin.rgeom.height);
+ pdata->brwin.rrect.width,
+ pdata->brwin.rrect.height);
}
@@ -189,12 +189,12 @@
}
else if(event.type == pdata->damage_event + XDamageNotify ){
XDamageNotifyEvent *e =(XDamageNotifyEvent *)( &event );
- WGeometry wgeom;
- CLIP_EVENT_AREA(e,&(pdata->brwin),&wgeom);
- if((wgeom.x>=0)&&(wgeom.y>=0)&&
- (wgeom.width>0)&&(wgeom.height>0)){
+ XRectangle xrect;
+ CLIP_EVENT_AREA(e,&(pdata->brwin),&xrect);
+ if((xrect.x>=0)&&(xrect.y>=0)&&
+ (xrect.width>0)&&(xrect.height>0)){
- inserts+=RectInsert(&pdata->rect_root,&wgeom);
+ inserts+=RectInsert(&pdata->rect_root,&xrect);
}
}
Modified: trunk/recordmydesktop/src/rmd_rectinsert.c
===================================================================
--- trunk/recordmydesktop/src/rmd_rectinsert.c 2008-11-22 15:58:54 UTC (rev 579)
+++ trunk/recordmydesktop/src/rmd_rectinsert.c 2008-11-22 16:39:04 UTC (rev 580)
@@ -33,53 +33,53 @@
/**
* Collide two rectangles and dictate most sane action for insertion,
* as well as provide the updated rectangle(s)
-* \param wgeom1 resident rectangle
+* \param xrect1 resident rectangle
*
-* \param wgeom2 New rectangle
+* \param xrect2 New rectangle
*
-* \param wgeom_return Pointer to rectangles to be inserted
+* \param xrect_return Pointer to rectangles to be inserted
*
-* \param ngeoms number of entries in wgeom_return
+* \param nrects number of entries in xrect_return
*
* \retval 0 No collision
*
-* \retval 1 wgeom1 is covered by wgeom2
+* \retval 1 xrect1 is covered by xrect2
*
-* \retval 2 wgeom2 is covered by wgeom1
+* \retval 2 xrect2 is covered by xrect1
*
-* \retval -1 wgeom1 was broken (new is picked up in wgeom_return)
+* \retval -1 xrect1 was broken (new is picked up in xrect_return)
*
-* \retval -2 wgeom2 was broken (new is picked up in wgeom_return)
+* \retval -2 xrect2 was broken (new is picked up in xrect_return)
*
-* \retval -10 Grouping the two geoms is possible
+* \retval -10 Grouping the two rects is possible
*
*/
-static int CollideRects(WGeometry *wgeom1,
- WGeometry *wgeom2,
- WGeometry wgeom_return[],
- int *ngeoms) {
+static int CollideRects(XRectangle *xrect1,
+ XRectangle *xrect2,
+ XRectangle xrect_return[],
+ int *nrects) {
//1 fits in 2
- if((wgeom1->x>=wgeom2->x)&&
- (wgeom1->x+wgeom1->width<=wgeom2->x+wgeom2->width)&&
- (wgeom1->y>=wgeom2->y)&&
- (wgeom1->y+wgeom1->height<=wgeom2->y+wgeom2->height)){
- *ngeoms=0;
+ if((xrect1->x>=xrect2->x)&&
+ (xrect1->x+xrect1->width<=xrect2->x+xrect2->width)&&
+ (xrect1->y>=xrect2->y)&&
+ (xrect1->y+xrect1->height<=xrect2->y+xrect2->height)){
+ *nrects=0;
return 1;
}
//2 fits in 1
- else if((wgeom2->x>=wgeom1->x)&&
- (wgeom2->x+wgeom2->width<=wgeom1->x+wgeom1->width)&&
- (wgeom2->y>=wgeom1->y)&&
- (wgeom2->y+wgeom2->height<=wgeom1->y+wgeom1->height)){
- *ngeoms=0;
+ else if((xrect2->x>=xrect1->x)&&
+ (xrect2->x+xrect2->width<=xrect1->x+xrect1->width)&&
+ (xrect2->y>=xrect1->y)&&
+ (xrect2->y+xrect2->height<=xrect1->y+xrect1->height)){
+ *nrects=0;
return 2;
}
//no collision
- else if((wgeom1->x+wgeom1->width<wgeom2->x)||
- (wgeom2->x+wgeom2->width<wgeom1->x)||
- (wgeom1->y+wgeom1->height<wgeom2->y)||
- (wgeom2->y+wgeom2->height<wgeom1->y)){
- *ngeoms=0;
+ else if((xrect1->x+xrect1->width<xrect2->x)||
+ (xrect2->x+xrect2->width<xrect1->x)||
+ (xrect1->y+xrect1->height<xrect2->y)||
+ (xrect2->y+xrect2->height<xrect1->y)){
+ *nrects=0;
return 0;
}
else{
@@ -91,10 +91,10 @@
//function should always start at the next element(which is logical since
//if any rect makes it to a points none of it's part collides with previous
//nodes on the list, too)
- int x1[2]={wgeom1->x,wgeom1->x+wgeom1->width};
- int y1[2]={wgeom1->y,wgeom1->y+wgeom1->height};
- int x2[2]={wgeom2->x,wgeom2->x+wgeom2->width};
- int y2[2]={wgeom2->y,wgeom2->y+wgeom2->height};
+ int x1[2]={xrect1->x,xrect1->x+xrect1->width};
+ int y1[2]={xrect1->y,xrect1->y+xrect1->height};
+ int x2[2]={xrect2->x,xrect2->x+xrect2->width};
+ int y2[2]={xrect2->y,xrect2->y+xrect2->height};
int enclosed[2][4],tot1,tot2;
enclosed[0][0]=(((x1[0]>=x2[0])&&(x1[0]<=x2[1])&&
(y1[0]>=y2[0])&&(y1[0]<=y2[1]))?1:0);
@@ -117,223 +117,223 @@
if((tot1==2)&&(tot2==2)){//same width or height, which is the best case
//group
if((enclosed[1][0]&&enclosed[1][1])&&
- (wgeom1->width==wgeom2->width)){
- *ngeoms=1;
- wgeom_return[0].x = wgeom1->x;
- wgeom_return[0].y = wgeom1->y;
- wgeom_return[0].width = wgeom1->width;
- wgeom_return[0].height = wgeom2->height + wgeom2->y - wgeom1->y;
+ (xrect1->width==xrect2->width)){
+ *nrects=1;
+ xrect_return[0].x = xrect1->x;
+ xrect_return[0].y = xrect1->y;
+ xrect_return[0].width = xrect1->width;
+ xrect_return[0].height = xrect2->height + xrect2->y - xrect1->y;
return -10;
}
else if((enclosed[1][0]&&enclosed[1][2])&&
- (wgeom1->height==wgeom2->height)){
- *ngeoms=1;
- wgeom_return[0].x = wgeom1->x;
- wgeom_return[0].y = wgeom1->y;
- wgeom_return[0].width = wgeom2->width + wgeom2->x - wgeom1->x;
- wgeom_return[0].height = wgeom1->height;
+ (xrect1->height==xrect2->height)){
+ *nrects=1;
+ xrect_return[0].x = xrect1->x;
+ xrect_return[0].y = xrect1->y;
+ xrect_return[0].width = xrect2->width + xrect2->x - xrect1->x;
+ xrect_return[0].height = xrect1->height;
return -10;
}
else if((enclosed[1][3]&&enclosed[1][1])&&
- (wgeom1->height==wgeom2->height)){
- *ngeoms=1;
- wgeom_return[0].x = wgeom2->x;
- wgeom_return[0].y = wgeom2->y;
- wgeom_return[0].width = wgeom1->width + wgeom1->x - wgeom2->x;
- wgeom_return[0].height = wgeom2->height;
+ (xrect1->height==xrect2->height)){
+ *nrects=1;
+ xrect_return[0].x = xrect2->x;
+ xrect_return[0].y = xrect2->y;
+ xrect_return[0].width = xrect1->width + xrect1->x - xrect2->x;
+ xrect_return[0].height = xrect2->height;
return -10;
}
else if((enclosed[1][3]&&enclosed[1][2])&&
- (wgeom1->width==wgeom2->width)){
- *ngeoms=1;
- wgeom_return[0].x = wgeom2->x;
- wgeom_return[0].y = wgeom2->y;
- wgeom_return[0].width = wgeom2->width;
- wgeom_return[0].height = wgeom1->height + wgeom1->y - wgeom2->y;
+ (xrect1->width==xrect2->width)){
+ *nrects=1;
+ xrect_return[0].x = xrect2->x;
+ xrect_return[0].y = xrect2->y;
+ xrect_return[0].width = xrect2->width;
+ xrect_return[0].height = xrect1->height + xrect1->y - xrect2->y;
return -10;
}
//if control reaches here therewasn't a group and we go on
}
if(tot2==2){
- //break geom2
- wgeom_return[0].x = wgeom2->x;
- wgeom_return[0].y = wgeom2->y;
- wgeom_return[0].width = wgeom2->width;
- wgeom_return[0].height = wgeom2->height;
- *ngeoms=1;
+ //break rect2
+ xrect_return[0].x = xrect2->x;
+ xrect_return[0].y = xrect2->y;
+ xrect_return[0].width = xrect2->width;
+ xrect_return[0].height = xrect2->height;
+ *nrects=1;
if(enclosed[1][0]&&enclosed[1][1]){
- wgeom_return[0].y = y1[1];
- wgeom_return[0].height -= y1[1] - y2[0];
+ xrect_return[0].y = y1[1];
+ xrect_return[0].height -= y1[1] - y2[0];
}
else if(enclosed[1][0]&&enclosed[1][2]){
- wgeom_return[0].x = x1[1];
- wgeom_return[0].width -= x1[1] - x2[0];
+ xrect_return[0].x = x1[1];
+ xrect_return[0].width -= x1[1] - x2[0];
}
else if(enclosed[1][3]&&enclosed[1][1])
- wgeom_return[0].width -= x2[1] - x1[0];
+ xrect_return[0].width -= x2[1] - x1[0];
else if(enclosed[1][3]&&enclosed[1][2])
- wgeom_return[0].height -= y2[1] - y1[0];
+ xrect_return[0].height -= y2[1] - y1[0];
return -2;
}
else if(tot1==2){
//if the first one breaks(which is already inserted)
//then we reenter the part that was left and the one
//that was to be inserted
- wgeom_return[1].x = wgeom2->x;
- wgeom_return[1].y = wgeom2->y;
- wgeom_return[1].width = wgeom2->width;
- wgeom_return[1].height = wgeom2->height;
- wgeom_return[0].x = wgeom1->x;
- wgeom_return[0].y = wgeom1->y;
- wgeom_return[0].width = wgeom1->width;
- wgeom_return[0].height = wgeom1->height;
- *ngeoms=1;
+ xrect_return[1].x = xrect2->x;
+ xrect_return[1].y = xrect2->y;
+ xrect_return[1].width = xrect2->width;
+ xrect_return[1].height = xrect2->height;
+ xrect_return[0].x = xrect1->x;
+ xrect_return[0].y = xrect1->y;
+ xrect_return[0].width = xrect1->width;
+ xrect_return[0].height = xrect1->height;
+ *nrects=1;
if(enclosed[0][0]&&enclosed[0][1]){
- wgeom_return[0].y = y2[1];
- wgeom_return[0].height -= y2[1] - y1[0];
+ xrect_return[0].y = y2[1];
+ xrect_return[0].height -= y2[1] - y1[0];
}
else if(enclosed[0][0]&&enclosed[0][2]){
- wgeom_return[0].x = x2[1];
- wgeom_return[0].width -= x2[1] - x1[0];
+ xrect_return[0].x = x2[1];
+ xrect_return[0].width -= x2[1] - x1[0];
}
else if(enclosed[0][3]&&enclosed[0][1])
- wgeom_return[0].width -= x1[1] - x2[0];
+ xrect_return[0].width -= x1[1] - x2[0];
else if(enclosed[0][3]&&enclosed[0][2])
- wgeom_return[0].height -= y1[1] - y2[0];
+ xrect_return[0].height -= y1[1] - y2[0];
return -1;
}
else if(tot2==1){ //in which case there is also tot1==1
//but we rather not break that
- //break geom2 in two
- *ngeoms=2;
+ //break rect2 in two
+ *nrects=2;
if(enclosed[1][0]){
//first
- wgeom_return[0].x = x1[1];
- wgeom_return[0].y = y2[0];
- wgeom_return[0].width = wgeom2->width - x1[1] + x2[0];
- wgeom_return[0].height = wgeom2->height;
+ xrect_return[0].x = x1[1];
+ xrect_return[0].y = y2[0];
+ xrect_return[0].width = xrect2->width - x1[1] + x2[0];
+ xrect_return[0].height = xrect2->height;
//second
- wgeom_return[1].x = x2[0];
- wgeom_return[1].y = y1[1];
- wgeom_return[1].width = x1[1] - x2[0];
- wgeom_return[1].height = wgeom2->height - y1[1] + y2[0];
+ xrect_return[1].x = x2[0];
+ xrect_return[1].y = y1[1];
+ xrect_return[1].width = x1[1] - x2[0];
+ xrect_return[1].height = xrect2->height - y1[1] + y2[0];
}
else if(enclosed[1][1]){
//first
- wgeom_return[0].x = x2[0];
- wgeom_return[0].y = y2[0];
- wgeom_return[0].width = wgeom2->width - x2[1] + x1[0];
- wgeom_return[0].height = wgeom2->height;
+ xrect_return[0].x = x2[0];
+ xrect_return[0].y = y2[0];
+ xrect_return[0].width = xrect2->width - x2[1] + x1[0];
+ xrect_return[0].height = xrect2->height;
//second
- wgeom_return[1].x = x1[0];
- wgeom_return[1].y = y1[1];
- wgeom_return[1].width = x2[1] - x1[0];
- wgeom_return[1].height = wgeom2->height - y1[1] + y2[0];
+ xrect_return[1].x = x1[0];
+ xrect_return[1].y = y1[1];
+ xrect_return[1].width = x2[1] - x1[0];
+ xrect_return[1].height = xrect2->height - y1[1] + y2[0];
}
else if(enclosed[1][2]){
//first(same as [1][0])
- wgeom_return[0].x = x1[1];
- wgeom_return[0].y = y2[0];
- wgeom_return[0].width = wgeom2->width - x1[1] + x2[0];
- wgeom_return[0].height = wgeom2->height;
+ xrect_return[0].x = x1[1];
+ xrect_return[0].y = y2[0];
+ xrect_return[0].width = xrect2->width - x1[1] + x2[0];
+ xrect_return[0].height = xrect2->height;
//second
- wgeom_return[1].x = x2[0];
- wgeom_return[1].y = y2[0];
- wgeom_return[1].width = x1[1] - x2[0];
- wgeom_return[1].height = wgeom2->height - y2[1] + y1[0];
+ xrect_return[1].x = x2[0];
+ xrect_return[1].y = y2[0];
+ xrect_return[1].width = x1[1] - x2[0];
+ xrect_return[1].height = xrect2->height - y2[1] + y1[0];
}
else if(enclosed[1][3]){
//first(same as [1][1])
- wgeom_return[0].x = x2[0];
- wgeom_return[0].y = y2[0];
- wgeom_return[0].width = wgeom2->width - x2[1] + x1[0];
- wgeom_return[0].height = wgeom2->height;
+ xrect_return[0].x = x2[0];
+ xrect_return[0].y = y2[0];
+ xrect_return[0].width = xrect2->width - x2[1] + x1[0];
+ xrect_return[0].height = xrect2->height;
//second
- wgeom_return[1].x = x1[0];
- wgeom_return[1].y = y2[0];
- wgeom_return[1].width = x2[1] - x1[0];
- wgeom_return[1].height = wgeom2->height - y2[1] + y1[0];
+ xrect_return[1].x = x1[0];
+ xrect_return[1].y = y2[0];
+ xrect_return[1].width = x2[1] - x1[0];
+ xrect_return[1].height = xrect2->height - y2[1] + y1[0];
}
return -2;
}
else{//polygons collide but no point of one is in the other
- //so we just keep the two parts of geom2 that are outside geom1
+ //so we just keep the two parts of rect2 that are outside rect1
- //break geom2 in two
+ //break rect2 in two
//two cases:
- //geom2 crossing vertically geom1
- //and geom2 crossing horizontally geom1
+ //rect2 crossing vertically rect1
+ //and rect2 crossing horizontally rect1
//The proper one can be found by simply checking x,y positions
- *ngeoms=2;
- if(wgeom2->y<wgeom1->y){
+ *nrects=2;
+ if(xrect2->y<xrect1->y){
//common
- wgeom_return[0].x = wgeom_return[1].x = x2[0];
- wgeom_return[0].width = wgeom_return[1].width = wgeom2->width;
+ xrect_return[0].x = xrect_return[1].x = x2[0];
+ xrect_return[0].width = xrect_return[1].width = xrect2->width;
- wgeom_return[0].y = y2[0];
- wgeom_return[0].height = wgeom2->height - y2[1] + y1[0];
- wgeom_return[1].y = y1[1];
- wgeom_return[1].height = y2[1] - y1[1];
+ xrect_return[0].y = y2[0];
+ xrect_return[0].height = xrect2->height - y2[1] + y1[0];
+ xrect_return[1].y = y1[1];
+ xrect_return[1].height = y2[1] - y1[1];
}
else{
//common
- wgeom_return[0].y = wgeom_return[1].y = y2[0];
- wgeom_return[0].height = wgeom_return[1].height = wgeom2->height;
+ xrect_return[0].y = xrect_return[1].y = y2[0];
+ xrect_return[0].height = xrect_return[1].height = xrect2->height;
- wgeom_return[0].x = x2[0];
- wgeom_return[0].width = wgeom2->width - x2[1] + x1[0];
- wgeom_return[1].x = x1[1];
- wgeom_return[1].width = x2[1] - x1[1];
+ xrect_return[0].x = x2[0];
+ xrect_return[0].width = xrect2->width - x2[1] + x1[0];
+ xrect_return[1].x = x1[1];
+ xrect_return[1].width = x2[1] - x1[1];
}
return -2;
}
}
}
-int RectInsert(RectArea **root,WGeometry *wgeom){
+int RectInsert(RectArea **root,XRectangle *xrect){
int total_insertions=0;
RectArea *temp=NULL,*newnode=(RectArea *)malloc(sizeof(RectArea));
//align
//we do need to know boundaries
- wgeom->width+=(wgeom->width%2)|(wgeom->x%2);
- wgeom->height+=(wgeom->height%2)|(wgeom->y%2);
- wgeom->width+=(wgeom->width%2);
- wgeom->height+=(wgeom->height%2);
- wgeom->x-=wgeom->x%2;
- wgeom->y-=wgeom->y%2;
-// fprintf(stderr," %d %d %d %d\n",wgeom->x,
+ xrect->width+=(xrect->width%2)|(xrect->x%2);
+ xrect->height+=(xrect->height%2)|(xrect->y%2);
+ xrect->width+=(xrect->width%2);
+ xrect->height+=(xrect->height%2);
+ xrect->x-=xrect->x%2;
+ xrect->y-=xrect->y%2;
+// fprintf(stderr," %d %d %d %d\n",xrect->x,
- newnode->geom.x=wgeom->x;
- newnode->geom.y=wgeom->y;
- newnode->geom.width=wgeom->width;
- newnode->geom.height=wgeom->height;
+ newnode->rect.x=xrect->x;
+ newnode->rect.y=xrect->y;
+ newnode->rect.width=xrect->width;
+ newnode->rect.height=xrect->height;
newnode->prev=newnode->next=NULL;
if(*root==NULL){
*root=newnode;
total_insertions=1;
}
else{
- WGeometry wgeom_return[2];
+ XRectangle xrect_return[2];
- int ngeoms=0,insert_ok=1,i=0;
+ int nrects=0,insert_ok=1,i=0;
temp=*root;
while(insert_ok){ //if something is broken list does not procceed
//(except on -1 collres case)
- int collres = CollideRects(&temp->geom, wgeom, &wgeom_return[0], &ngeoms);
+ int collres = CollideRects(&temp->rect, xrect, &xrect_return[0], &nrects);
if((!collres))
insert_ok=1;
else{
- for(i=0;i<ngeoms;i++){
- wgeom_return[i].width += (wgeom_return[i].width % 2) |
- (wgeom_return[i].x % 2);
- wgeom_return[i].height += (wgeom_return[i].height % 2) |
- (wgeom_return[i].y % 2);
- wgeom_return[i].width += (wgeom_return[i].width % 2);
- wgeom_return[i].height += (wgeom_return[i].height % 2);
- wgeom_return[i].x -= wgeom_return[i].x % 2;
- wgeom_return[i].y -= wgeom_return[i].y % 2;
+ for(i=0;i<nrects;i++){
+ xrect_return[i].width += (xrect_return[i].width % 2) |
+ (xrect_return[i].x % 2);
+ xrect_return[i].height += (xrect_return[i].height % 2) |
+ (xrect_return[i].y % 2);
+ xrect_return[i].width += (xrect_return[i].width % 2);
+ xrect_return[i].height += (xrect_return[i].height % 2);
+ xrect_return[i].x -= xrect_return[i].x % 2;
+ xrect_return[i].y -= xrect_return[i].y % 2;
}
insert_ok=0;
switch(collres){
@@ -345,8 +345,8 @@
temp->prev->next=temp->next;
temp->next->prev=temp->prev;
free(temp);
- if((wgeom->width>0)&&(wgeom->height>0))
- total_insertions+=RectInsert(&temp1,wgeom);
+ if((xrect->width>0)&&(xrect->height>0))
+ total_insertions+=RectInsert(&temp1,xrect);
}
else{
temp->prev->next=newnode;
@@ -359,10 +359,10 @@
if((*root)->next!=NULL){
(*root)=(*root)->next;
(*root)->prev=NULL;
- if((wgeom->width>0)&&(wgeom->height>0))
- total_insertions+=RectInsert(root,wgeom);
+ if((xrect->width>0)&&(xrect->height>0))
+ total_insertions+=RectInsert(root,xrect);
}
- else if((wgeom->width>0)&&(wgeom->height>0)){
+ else if((xrect->width>0)&&(xrect->height>0)){
*root=newnode;
total_insertions++;
}
@@ -379,12 +379,12 @@
case -1://current node is broken and reinserted
//(in same pos)
//newnode is also reinserted
- if (wgeom_return[0].width > 0 &&
- wgeom_return[0].height > 0) {
- temp->geom.x = wgeom_return[0].x;
- temp->geom.y = wgeom_return[0].y;
- temp->geom.width = wgeom_return[0].width;
- temp->geom.height = wgeom_return[0].height;
+ if (xrect_return[0].width > 0 &&
+ xrect_return[0].height > 0) {
+ temp->rect.x = xrect_return[0].x;
+ temp->rect.y = xrect_return[0].y;
+ temp->rect.width = xrect_return[0].width;
+ temp->rect.height = xrect_return[0].height;
if(temp->next==NULL){
temp->next=newnode;
newnode->prev=temp;
@@ -412,49 +412,49 @@
temp->next->prev=temp->prev;
temp->prev->next=temp->next;
total_insertions+=RectInsert(&temp->next,
- wgeom);
+ xrect);
}
free(temp);
}
break;
case -2://new is broken and reinserted
if(temp->next==NULL){
- total_insertions+=ngeoms;
- newnode->geom.x = wgeom_return[0].x;
- newnode->geom.y = wgeom_return[0].y;
- newnode->geom.width = wgeom_return[0].width;
- newnode->geom.height = wgeom_return[0].height;
+ total_insertions+=nrects;
+ newnode->rect.x = xrect_return[0].x;
+ newnode->rect.y = xrect_return[0].y;
+ newnode->rect.width = xrect_return[0].width;
+ newnode->rect.height = xrect_return[0].height;
temp->next=newnode;
newnode->prev=temp;
- if(ngeoms>1){
+ if(nrects>1){
RectArea *newnode1=
(RectArea *)malloc(sizeof(RectArea));
- newnode1->geom.x = wgeom_return[1].x;
- newnode1->geom.y = wgeom_return[1].y;
- newnode1->geom.width = wgeom_return[1].width;
- newnode1->geom.height = wgeom_return[1].height;
+ newnode1->rect.x = xrect_return[1].x;
+ newnode1->rect.y = xrect_return[1].y;
+ newnode1->rect.width = xrect_return[1].width;
+ newnode1->rect.height = xrect_return[1].height;
newnode->next=newnode1;
newnode1->prev=newnode;
newnode1->next=NULL;
}
}
else{
- for(i=0;i<ngeoms;i++){
- if(wgeom_return[i].width > 0 &&
- wgeom_return[i].height > 0)
+ for(i=0;i<nrects;i++){
+ if(xrect_return[i].width > 0 &&
+ xrect_return[i].height > 0)
total_insertions+=
- RectInsert(&temp->next, &wgeom_return[i]);
+ RectInsert(&temp->next, &xrect_return[i]);
}
}
break;
case -10://grouped
if(temp->prev==NULL){
if(temp->next==NULL){//empty list
- newnode->geom.x = wgeom_return[0].x;
- newnode->geom.y = wgeom_return[0].y;
- newnode->geom.width = wgeom_return[0].width;
- newnode->geom.height = wgeom_return[0].height;
+ newnode->rect.x = xrect_return[0].x;
+ newnode->rect.y = xrect_return[0].y;
+ newnode->rect.width = xrect_return[0].width;
+ newnode->rect.height = xrect_return[0].height;
*root=newnode;
free(temp);
@@ -464,17 +464,17 @@
*root=temp->next;
(*root)->prev=NULL;
free(temp);
- if(wgeom_return[0].width > 0 &&
- wgeom_return[0].height > 0)
+ if(xrect_return[0].width > 0 &&
+ xrect_return[0].height > 0)
total_insertions+=
- RectInsert(root, &wgeom_return[0]);
+ RectInsert(root, &xrect_return[0]);
}
}
else if(temp->next==NULL){//last, enter anyway
- newnode->geom.x = wgeom_return[0].x;
- newnode->geom.y = wgeom_return[0].y;
- newnode->geom.width = wgeom_return[0].width;
- newnode->geom.height = wgeom_return[0].height;
+ newnode->rect.x = xrect_return[0].x;
+ newnode->rect.y = xrect_return[0].y;
+ newnode->rect.width = xrect_return[0].width;
+ newnode->rect.height = xrect_return[0].height;
temp->prev->next=newnode;
newnode->prev=temp->prev;
free(temp);
@@ -485,10 +485,10 @@
temp->prev->next=temp->next;
temp->next->prev=temp->prev;
free(temp);
- if(wgeom_return[0].width > 0 &&
- wgeom_return[0].height > 0)
+ if(xrect_return[0].width > 0 &&
+ xrect_return[0].height > 0)
total_insertions+=
- RectInsert(&temp1, &wgeom_return[0]);
+ RectInsert(&temp1, &xrect_return[0]);
}
break;
}
Modified: trunk/recordmydesktop/src/rmd_rectinsert.h
===================================================================
--- trunk/recordmydesktop/src/rmd_rectinsert.h 2008-11-22 15:58:54 UTC (rev 579)
+++ trunk/recordmydesktop/src/rmd_rectinsert.h 2008-11-22 16:39:04 UTC (rev 580)
@@ -36,14 +36,14 @@
* with the existing ones
* \param root Root entry of the list
*
-* \param wgeom New area to be inserted
+* \param xrect New area to be inserted
*
* \returns Number of insertions during operation
*
* \note This function is reentrant and recursive. The number
* of insertions takes this into account.
*/
-int RectInsert(RectArea **root, WGeometry *wgeom);
+int RectInsert(RectArea **root, XRectangle *xrect);
/**
* Clean up a list of areas marked for update.
Modified: trunk/recordmydesktop/src/rmd_rescue.c
===================================================================
--- trunk/recordmydesktop/src/rmd_rescue.c 2008-11-22 15:58:54 UTC (rev 579)
+++ trunk/recordmydesktop/src/rmd_rescue.c 2008-11-22 16:39:04 UTC (rev 580)
@@ -39,13 +39,14 @@
int rmdRescue(const char *path){
-
+
int i=0,
- width,
- height,
offset_x,
offset_y;
+ unsigned short width,
+ height;
+
ProgData pdata;
EncData enc_data;
CacheData cache_data;
@@ -77,10 +78,10 @@
return 1;
- width=((pdata.brwin.rgeom.width + 15) >>4)<<4;
- height=((pdata.brwin.rgeom.height + 15) >>4)<<4;
- offset_x=((width-pdata.brwin.rgeom.width)/2)&~1;
- offset_y=((height-pdata.brwin.rgeom.height)/2)&~1;
+ width=((pdata.brwin.rrect.width + 15) >>4)<<4;
+ height=((pdata.brwin.rrect.height + 15) >>4)<<4;
+ offset_x=((width-pdata.brwin.rrect.width)/2)&~1;
+ offset_y=((height-pdata.brwin.rrect.height)/2)&~1;
enc_data.yuv.y=(unsigned char *)malloc(height*width);
Modified: trunk/recordmydesktop/src/rmd_setbrwindow.c
===================================================================
--- trunk/recordmydesktop/src/rmd_setbrwindow.c 2008-11-22 15:58:54 UTC (rev 579)
+++ trunk/recordmydesktop/src/rmd_setbrwindow.c 2008-11-22 16:39:04 UTC (rev 580)
@@ -43,7 +43,7 @@
*
* \note This is called separately for width and height.
*/
-static void SizePack2_8_16(int *start, int *size, int limit) {
+static void SizePack2_8_16(short *start, unsigned short *size, unsigned short limit) {
int octoffset,hexoffset;
//align in two
@@ -132,18 +132,18 @@
if(args->windowid==0){//root window
//first set it up
brwin->windowid=specs->root;
- brwin->geom.x=brwin->geom.y=0;
- brwin->geom.width=specs->width;
- brwin->geom.height=specs->height;
- brwin->rgeom.x=args->x;
- brwin->rgeom.y=args->y;
- brwin->rgeom.width=((args->width)?
- args->width:specs->width-brwin->rgeom.x);
- brwin->rgeom.height=((args->height)?
- args->height:specs->height-brwin->rgeom.y);
+ brwin->rect.x=brwin->rect.y=0;
+ brwin->rect.width=specs->width;
+ brwin->rect.height=specs->height;
+ brwin->rrect.x=args->x;
+ brwin->rrect.y=args->y;
+ brwin->rrect.width=((args->width)?
+ args->width:specs->width-brwin->rrect.x);
+ brwin->rrect.height=((args->height)?
+ args->height:specs->height-brwin->rrect.y);
//and then check validity
- if((brwin->rgeom.x+brwin->rgeom.width>specs->width)||
- (brwin->rgeom.y+brwin->rgeom.height>specs->height)){
+ if((brwin->rrect.x+brwin->rrect.width>specs->width)||
+ (brwin->rrect.y+brwin->rrect.height>specs->height)){
fprintf(stderr,"Window size specification out of bounds!"
"(current resolution:%dx%d)\n",
specs->width,specs->height);
@@ -169,44 +169,44 @@
&transl_y,
&wchid);
- brwin->geom.x=attribs.x-transl_x;
- brwin->geom.y=attribs.y-transl_y;
- brwin->geom.width=attribs.width;
- brwin->geom.height=attribs.height;
- if((brwin->geom.x+brwin->geom.width>specs->width)||
- (brwin->geom.y+brwin->geom.height>specs->height)){
+ brwin->rect.x=attribs.x-transl_x;
+ brwin->rect.y=attribs.y-transl_y;
+ brwin->rect.width=attribs.width;
+ brwin->rect.height=attribs.height;
+ if((brwin->rect.x+brwin->rect.width>specs->width)||
+ (brwin->rect.y+brwin->rect.height>specs->height)){
fprintf(stderr,"Window must be on visible screen area!\n");
return FALSE;
}
- brwin->rgeom.x=brwin->geom.x+args->x;
- brwin->rgeom.y=brwin->geom.y+args->y;
- brwin->rgeom.width=((args->width)?
- args->width:brwin->geom.width-args->x);
- brwin->rgeom.height=((args->height)?
- args->height:brwin->geom.height-args->y);
- if((args->x+brwin->rgeom.width>brwin->geom.width)||
- (args->y+brwin->rgeom.height>brwin->geom.height)){
+ brwin->rrect.x=brwin->rect.x+args->x;
+ brwin->rrect.y=brwin->rect.y+args->y;
+ brwin->rrect.width=((args->width)?
+ args->width:brwin->rect.width-args->x);
+ brwin->rrect.height=((args->height)?
+ args->height:brwin->rect.height-args->y);
+ if((args->x+brwin->rrect.width>brwin->rect.width)||
+ (args->y+brwin->rrect.height>brwin->rect.height)){
fprintf(stderr,"Specified Area is larger than window!\n");
return FALSE;
}
}
fprintf(stderr, "Initial recording window is set to:\n"
...
[truncated message content] |
|
From: svn c. f. r. <rec...@li...> - 2008-11-22 15:59:00
|
Revision: 579
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=579&view=rev
Author: iovar
Date: 2008-11-22 15:58:54 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
Readded qt-recordmydesktop.png, qt-recordmydesktop.svg
in EXTRA_DIST of src/Makefile.am since they were removed by mistake.
Modified Paths:
--------------
trunk/qt-recordmydesktop/src/Makefile.am
Modified: trunk/qt-recordmydesktop/src/Makefile.am
===================================================================
--- trunk/qt-recordmydesktop/src/Makefile.am 2008-11-22 10:58:07 UTC (rev 578)
+++ trunk/qt-recordmydesktop/src/Makefile.am 2008-11-22 15:58:54 UTC (rev 579)
@@ -30,6 +30,8 @@
EXTRA_DIST= qt-recordMyDesktop.in\
qt-recordmydesktop.desktop\
+ qt-recordmydesktop.png\
+ qt-recordmydesktop.svg\
media-playback-pause.svg\
media-playback-stop.svg\
media-record.svg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: svn c. f. r. <rec...@li...> - 2008-11-22 10:58:15
|
Revision: 578
http://recordmydesktop.svn.sourceforge.net/recordmydesktop/?rev=578&view=rev
Author: iovar
Date: 2008-11-22 10:58:07 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
Changed qt-recordMyDesktop's license to GPL version 3 (or later).
All license headers have been changed to reflect this change and COPYING.gpl3 has been added with
the full text of the license. Also, the previous record/pause/stop icons and their source svg's
have been removed and replaced with equivalents from the Oxygen project, provided under the
GNU-LGPL version 3 (or later). COPYING.lgpl3 and COPYING.icons have been added to provide
the neccessary information. Makefile.am and src/Makefile.am have been modified to reflect
this change in the project files. Version changed in configure.ac, to 0.3.8-cvs
Modified Paths:
--------------
trunk/qt-recordmydesktop/AUTHORS
trunk/qt-recordmydesktop/INSTALL
trunk/qt-recordmydesktop/Makefile.am
trunk/qt-recordmydesktop/README
trunk/qt-recordmydesktop/configure.ac
trunk/qt-recordmydesktop/src/Makefile.am
trunk/qt-recordmydesktop/src/qt-recordMyDesktop.in
trunk/qt-recordmydesktop/src/rmdFrame.py
trunk/qt-recordmydesktop/src/rmdMonitor.py
trunk/qt-recordmydesktop/src/rmdPrefsWidget.py
trunk/qt-recordmydesktop/src/rmdSelect.py
trunk/qt-recordmydesktop/src/rmdSelectThumb.py
trunk/qt-recordmydesktop/src/rmdSimple.py
trunk/qt-recordmydesktop/src/rmdStrings.py
trunk/qt-recordmydesktop/src/rmdTrayIcon.py
trunk/qt-recordmydesktop/src/rmdTrayPopup.py
Added Paths:
-----------
trunk/qt-recordmydesktop/COPYING
trunk/qt-recordmydesktop/COPYING.gpl3
trunk/qt-recordmydesktop/COPYING.icons
trunk/qt-recordmydesktop/COPYING.lgpl3
trunk/qt-recordmydesktop/src/media-playback-pause.svg
trunk/qt-recordmydesktop/src/media-playback-stop.svg
trunk/qt-recordmydesktop/src/media-record.svg
Removed Paths:
-------------
trunk/qt-recordmydesktop/COPYING
trunk/qt-recordmydesktop/src/qt-recordmydesktop_pause.png
trunk/qt-recordmydesktop/src/qt-recordmydesktop_pause.svg
trunk/qt-recordmydesktop/src/qt-recordmydesktop_record.png
trunk/qt-recordmydesktop/src/qt-recordmydesktop_record.svg
trunk/qt-recordmydesktop/src/qt-recordmydesktop_stop.png
trunk/qt-recordmydesktop/src/qt-recordmydesktop_stop.svg
Modified: trunk/qt-recordmydesktop/AUTHORS
===================================================================
--- trunk/qt-recordmydesktop/AUTHORS 2008-11-21 18:56:44 UTC (rev 577)
+++ trunk/qt-recordmydesktop/AUTHORS 2008-11-22 10:58:07 UTC (rev 578)
@@ -15,3 +15,16 @@
Brazilian: Caio Alonso
Spanish: José "L. Redrejo" Rodríguez
+
+
+The icons media-playback-pause.svg, media-playback-stop.svg and
+media-record.svg, in the src/ directory, are part of the Oxygen
+project and are licenced under the GNU-LGPL version 3 or (at your option)
+any later version.
+( The icons have been copied and uncompressed, at 22/11/2008 from
+http://websvn.kde.org/trunk/KDE/kdebase/runtime/pics/oxygen/scalable/actions/
+where they existed in a compressed form, under the same names but with svgz
+extensions )
+
+Author information about these exists in COPYING.icons.
+
Deleted: trunk/qt-recordmydesktop/COPYING
===================================================================
--- trunk/qt-recordmydesktop/COPYING 2008-11-21 18:56:44 UTC (rev 577)
+++ trunk/qt-recordmydesktop/COPYING 2008-11-22 10:58:07 UTC (rev 578)
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 Library 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.
-
- GNU GENERAL PUBLIC LICENSE
- 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
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
Added: trunk/qt-recordmydesktop/COPYING
===================================================================
--- trunk/qt-recordmydesktop/COPYING (rev 0)
+++ trunk/qt-recordmydesktop/COPYING 2008-11-22 10:58:07 UTC (rev 578)
@@ -0,0 +1,5 @@
+qt-recordMyDesktop is licensed under the GNU-GPL3 and GNU-LGPL3 licenses.
+
+See COPYING.gpl3, COPYING.lgpl3 and COPYING.icons
+
+
Added: trunk/qt-recordmydesktop/COPYING.gpl3
===================================================================
--- trunk/qt-recordmydesktop/COPYING.gpl3 (rev 0)
+++ trunk/qt-recordmydesktop/COPYING.gpl3 2008-11-22 10:58:07 UTC (rev 578)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Added: trunk/qt-recordmydesktop/COPYING.icons
===================================================================
--- trunk/qt-recordmydesktop/COPYING.icons (rev 0)
+++ trunk/qt-recordmydesktop/COPYING.icons 2008-11-22 10:58:07 UTC (rev 578)
@@ -0,0 +1,48 @@
+The Oxygen Icon Theme
+ Copyright (C) 2007 David Vignoni <da...@ic...>
+ Copyright (C) 2007 Johann Ollivier Lapeyre <jo...@ox...>
+ Copyright (C) 2007 Kenneth Wimer <kw...@bo...>
+ Copyright (C) 2007 Nuno Fernades Pinheiro <nf....@gm...>
+ Copyright (C) 2007 Riccardo Iaconelli <ric...@ox...>
+ Copyright (C) 2007 David Miller <mi...@ox...>
+
+and others
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+Clarification:
+
+ The GNU Lesser General Public License or LGPL is written for
+ software libraries in the first place. We expressly want the LGPL to
+ be valid for this artwork library too.
+
+ KDE Oxygen theme icons is a special kind of software library, it is an
+ artwork library, it's elements can be used in a Graphical User Interface, or
+ GUI.
+
+ Source code, for this library means:
+ - where they exist, SVG;
+ - otherwise, if applicable, the multi-layered formats xcf or psd, or
+ otherwise png.
+
+ The LGPL in some sections obliges you to make the files carry
+ notices. With images this is in some cases impossible or hardly useful.
+
+ With this library a notice is placed at a prominent place in the directory
+ containing the elements. You may follow this practice.
+
+ The exception in section 5 of the GNU Lesser General Public License covers
+ the use of elements of this art library in a GUI.
+
+ kde-artists [at] kde....
[truncated message content] |
