diff options
| author | 2010-08-31 09:10:41 +0000 | |
|---|---|---|
| committer | 2010-08-31 09:10:41 +0000 | |
| commit | c8ba5d212c9da7d11f08684c5d244cfaad4d0032 (patch) | |
| tree | ed21d44e601fd369c5830bf7c445879ed3ebc5a0 /src/modules/mediaplayer | |
| parent | some fix for OnHighlight doc (diff) | |
| download | KVIrc-c8ba5d212c9da7d11f08684c5d244cfaad4d0032.tar.gz KVIrc-c8ba5d212c9da7d11f08684c5d244cfaad4d0032.tar.bz2 KVIrc-c8ba5d212c9da7d11f08684c5d244cfaad4d0032.zip | |
applied typo fixes for the "file" and "config" modules (thank OmegaPhil)
fixed fsf address in python/pythoncore modules
fixed "space before comma" in documentation/coments/code
regenerated translations
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4954 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/mediaplayer')
| -rw-r--r-- | src/modules/mediaplayer/libkvimediaplayer.cpp | 4 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_interface.h | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_mp3.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_mprisinterface.cpp | 6 | ||||
| -rw-r--r-- | src/modules/mediaplayer/winamp.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp index bb4d3c623..9f519cab8 100644 --- a/src/modules/mediaplayer/libkvimediaplayer.cpp +++ b/src/modules/mediaplayer/libkvimediaplayer.cpp @@ -543,7 +543,7 @@ MP_KVS_FUNCTION(playerList) @description: Plays the media specified by the <mrl> on the currently selected media player interface. <mrl> is a standard Media Resource - Locator. Examples of such locators are: 'file:///home/myfile.mp3' , + Locator. Examples of such locators are: 'file:///home/myfile.mp3', 'http://streaming.server.top:123', 'dvd:// or dvb://channelname'. Take a look at the [module:mediaplayer]mediaplayer module documentation[/module] for more details about how it works.[br] @@ -741,7 +741,7 @@ MP_KVS_SIMPLE_COMMAND(mute,mute) @description: Returns the mrl of the media currently played by the selected media player interface. The mrl is a standard Media Resource Locator. - Examples of such locators are: 'file:///home/myfile.mp3' , + Examples of such locators are: 'file:///home/myfile.mp3', 'http://streaming.server.top:123', 'dvd:// or dvb://channelname'. This means that the returned string may NOT refer to a local file: it refers to the local file only if the 'file://' prefix is found ([fnc]$mediaplayer.localFile()[/fnc] diff --git a/src/modules/mediaplayer/mp_interface.h b/src/modules/mediaplayer/mp_interface.h index ca0615f3a..87631b2d6 100644 --- a/src/modules/mediaplayer/mp_interface.h +++ b/src/modules/mediaplayer/mp_interface.h @@ -78,7 +78,7 @@ public: // communication errors. virtual QString nowPlaying() = 0; // currently played media resource locator - // file://<filepath> for local files, dvb:// for dvb media , dvd:// for dvd's + // file://<filepath> for local files, dvb:// for dvb media, dvd:// for dvd's // http:// for audio streams etc... // empty if player is not playing (or in the tragic case that the player // can't determine the url). diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp index 19ee2e0f2..60a66a5de 100644 --- a/src/modules/mediaplayer/mp_mp3.cpp +++ b/src/modules/mediaplayer/mp_mp3.cpp @@ -443,7 +443,7 @@ char *unpad(char *string) return string; } -bool scan_mp3_file(QString& ,mp3info * i) +bool scan_mp3_file(QString&,mp3info * i) { //memset(i,0,sizeof(mp3info)); resetmp3infoStruct(i); diff --git a/src/modules/mediaplayer/mp_mprisinterface.cpp b/src/modules/mediaplayer/mp_mprisinterface.cpp index 021b2b255..ce382b5a0 100644 --- a/src/modules/mediaplayer/mp_mprisinterface.cpp +++ b/src/modules/mediaplayer/mp_mprisinterface.cpp @@ -30,8 +30,8 @@ according to MPRIS 1.0, GetStatus returns struct of 4 integers. First integer: 0 = Playing, 1 = Paused, 2 = Stopped. - Second interger: 0 = Playing linearly , 1 = Playing randomly. - Third integer: 0 = Go to the next element once the current has finished playing , 1 = Repeat the current element + Second interger: 0 = Playing linearly, 1 = Playing randomly. + Third integer: 0 = Go to the next element once the current has finished playing, 1 = Repeat the current element Fourth integer: 0 = Stop playing once the last element has been played, 1 = Never give up playing */ @@ -487,7 +487,7 @@ MP_IMPLEMENT_DESCRIPTOR( __tr2qs_ctx( "An interface to Qmmp.\n" \ "Download it from http://qmmp.ylsoftware.com\n" - , + , "mediaplayer" ) ) diff --git a/src/modules/mediaplayer/winamp.cpp b/src/modules/mediaplayer/winamp.cpp index 81bbdeda6..60bcb29e7 100644 --- a/src/modules/mediaplayer/winamp.cpp +++ b/src/modules/mediaplayer/winamp.cpp @@ -30,7 +30,7 @@ // This is a winamp-kvirc interface plugin // -// This stuff is compiled only on windows , as a separate dll module +// This stuff is compiled only on windows, as a separate dll module typedef struct |
