--- a/scripts/ixmmsa.pl
+++ b/scripts/ixmmsa.pl
@@ -23,7 +23,7 @@ use strict;
use Irssi;
use vars qw($VERSION %IRSSI);
-$VERSION = "0.2";
+$VERSION = "0.2+1";
%IRSSI = (
authors => 'Kristof Korwisi',
contact => 'kk@manoli.im-dachgeschoss.de',
@@ -31,7 +31,7 @@ $VERSION = "0.2";
description => '/xmms announces which _file_ is currently playing. E.g. Currently playing: "Kieran Halpin & Band - Mirror Town.mp3"',
license => 'GPL',
url => 'http://manoli.im-dachgeschoss.de/~kk/',
- changed => '2002-09-17',
+ changed => '2006-10-27',
changes => 'added some comments, added $announce_message:_*-stuff',
);
@@ -51,6 +51,7 @@ sub cmd_xmms {
$filename =~ s/.*\///g; # removes path
$filename =~ s/^$/Nothing's playing/; # in case there's nothing to listen to ;-)
+ $filename =~ s/[\r\n]/ /g; # remove newline characters
if ($witem && ($witem->{type} eq "CHANNEL" || $witem->{type} eq "QUERY")) {
$witem->command("MSG ".$witem->{name}." $announce_message_front \"$filename\" $announce_message_after");
--- a/scripts/l33tmusic.pl
+++ b/scripts/l33tmusic.pl
@@ -6,7 +6,7 @@ use Xmms;
use Xmms::Remote ();
#changed to recommended version system with onedigit.twodigits, sorry :)
-$VERSION = '2.00';
+$VERSION = '2.01';
%IRSSI = (
authors => 'Mikachu',
contact => 'Mikachu @ quakenet|freenode|arcnet|oftc',
@@ -82,6 +82,10 @@ sub getvars {
$status = "Stopped";
}
$filename = $xmmscontrol->get_playlist_file($wantedpos);
+
+ $title =~ s/[\r\n]/ /g;
+ $filename =~ s/[\r\n]/ /g;
+
return($position, $title, $time, $status, $filename);
} elsif ($_[0] =~ "filename") {
my $xmmscontrol = Xmms::Remote->new;
@@ -92,6 +96,7 @@ sub getvars {
}
$wantedpos = $xmmscontrol->get_playlist_pos + $wantedpos;
$filename = $xmmscontrol->get_playlist_file($wantedpos);
+ $filename =~ s/[\r\n]/ /g;
return($filename);
}
}
--- a/scripts/mpg123.pl
+++ b/scripts/mpg123.pl
@@ -28,7 +28,7 @@ use Irssi::Irc;
use strict;
use vars qw($VERSION %IRSSI);
-$VERSION = "0.01";
+$VERSION = "0.01+1";
%IRSSI = (
authors => 'Ricardo Mesquita',
contact => 'ricardomesquita@netcabo.pt',
@@ -36,7 +36,7 @@ $VERSION = "0.01";
description => 'Display current mpg123 track',
url => 'http://pwp.netcabo.pt/ricardomesquita/irssi',
license => 'GPLv2',
- changed => 'Sat Aug 24 00:37:17 GMT 2002'
+ changed => 'Mon Nov 27 18:00:00 CET 2006'
);
my $mpg123file = glob "~/.irssi/scripts/mpg123.log";
@@ -78,6 +78,7 @@ sub cmd_mpg123 {
}
}
close(f);
+ $mpg123msg =~ s/[\r\n]/ /g;
$server->command("action ". $channel . " $mpg123msg");
}
}
--- a/scripts/ogg123.pl
+++ b/scripts/ogg123.pl
@@ -32,7 +32,7 @@ use Irssi::Irc;
use strict;
use vars qw($VERSION %IRSSI);
-$VERSION = "0.01";
+$VERSION = "0.01+1";
%IRSSI = (
authors => 'Ricardo Mesquita',
contact => 'ricardomesquita@netcabo.pt',
@@ -40,7 +40,7 @@ $VERSION = "0.01";
description => 'Display current ogg123 track',
url => 'http://pwp.netcabo.pt/ricardomesquita/irssi',
license => 'GPLv2',
- changed => 'Wed Aug 28 19:39:37 GMT 2002'
+ changed => 'Mon Nov 27 18:00:00 CET 2006'
);
my $ogg123file = glob "~/.irssi/scripts/ogg123.log";
@@ -87,6 +87,7 @@ sub cmd_ogg123 {
}
}
close(f);
+ $ogg123msg =~ s/[\r\n]/ /g;
$server->command("action ". $channel . " $ogg123msg");
}
}
--- a/scripts/xmms.pl
+++ b/scripts/xmms.pl
@@ -28,14 +28,14 @@
use strict;
use Irssi;
use vars qw($VERSION %IRSSI);
-$VERSION = "2.0";
+$VERSION = "2.0+1";
%IRSSI = {
authors => 'Simon Shine',
contact => 'simon@blueshell.dk',
name => 'xmms',
description => 'XMMS-InfoPipe front-end - allow /np [-help] [dest]',
license => 'Public Domain',
- changed => '2004-01-15'
+ changed => '2006-10-27'
};
Irssi::settings_add_str('xmms', 'xmms_fifo', '/tmp/xmms-info');
@@ -139,6 +139,9 @@ Example: /set xmms_format_time %%m minut
$format =~ s/\%$_/$fs{$_}/g;
}
+ # remove newline characters
+ $format =~ s/[\r\n]/ /g;
+
# sending it.
if ($server && $server->{connected} && $witem &&
($witem->{type} eq "CHANNEL" || $witem->{type} eq "QUERY")) {
--- a/scripts/xmms2.pl
+++ b/scripts/xmms2.pl
@@ -27,7 +27,7 @@ use Irssi;
use vars qw($VERSION %IRSSI);
use strict;
-$VERSION = '1.1.3';
+$VERSION = '1.1.3+1';
%IRSSI = (
authors => 'simon',
contact => 'simon\@blueshell.dk',
@@ -35,7 +35,7 @@ $VERSION = '1.1.3';
description => 'Returns XMMS-InfoPipe data',
license => 'Public Domain',
url => 'http://irssi.dk/',
- changed => 'Sun Mar 10 14:36:49 CET 2002',
+ changed => 'Mon Nov 27 18:00:00 CET 2006',
commands => '/np',
note => 'Make sure InfoPipe is configured!'
);
@@ -73,6 +73,7 @@ sub cmd_xmms {
$pos = sprintf("%.0f", $postotal / $ttotal * 100); # calc. position
# my $output = "np: $title ($pos% of $t)";
my $output = "np: $title ($t)";
+ $output =~ s/[\r\n]/ /g; # remove newline characters
if(!$server || !$server->{connected}) { # are we even connected?
Irssi::print $output;
return
--- a/scripts/xmmsinfo.pl
+++ b/scripts/xmmsinfo.pl
@@ -31,7 +31,7 @@ use Irssi::XMMSInfo;
use vars qw($VERSION %IRSSI);
# global variables
-$VERSION = sprintf("%d.%02d", q$Revision: 1.1.1.1 $ =~ /^.+?(\d+)\.(\d+)/);
+$VERSION = sprintf("%d.%02d", q$Revision: 1.1.1.2 $ =~ /^.+?(\d+)\.(\d+)/);
%IRSSI = (
authors => 'Tuomas Jormola',
contact => 'tjormola@cc.hut.fi',
@@ -39,7 +39,7 @@ $VERSION = sprintf("%d.%02d", q$Revision
description => '/xmmsinfo to tell what you\'re currently playing',
license => 'GPLv2',
url => 'http://shakti.tky.hut.fi/stuff.xml#irssi',
- changed => '2002-0324T22:42+0300',
+ changed => '2006-1027T18:00+0300',
);
if(runningUnderIrssi()) {
@@ -102,6 +102,7 @@ sub commandXmmsInfo {
} elsif($i->isFatalError || !$server || !$server->{connected} || (!$args && !$target)) {
Irssi::print($o);
} else {
+ $o =~ s/[\r\n]/ /g; # remove newline characters
my($t) = $args || $target->{name};
$server->command("msg $t $o");
}
syntax highlighted by Code2HTML, v. 0.9.1