summaryrefslogtreecommitdiff
path: root/plugins/adplug/adplug/flash.cpp
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <wakeroid@gmail.com>2010-07-26 10:04:43 +0200
committerGravatar Alexey Yakovenko <wakeroid@gmail.com>2010-07-26 10:04:43 +0200
commitfe3f99c92a8437a353ba12075d6c3273d04c4e3f (patch)
tree34d97babbe5696f21779866fafad217b60c2bead /plugins/adplug/adplug/flash.cpp
parent4deca01c3a7edaf66374bd35e6fb50d4d9564b17 (diff)
merged non-android-specific changes from android branch
Diffstat (limited to 'plugins/adplug/adplug/flash.cpp')
-rw-r--r--plugins/adplug/adplug/flash.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/adplug/adplug/flash.cpp b/plugins/adplug/adplug/flash.cpp
index a6bf511c..8fc8f333 100644
--- a/plugins/adplug/adplug/flash.cpp
+++ b/plugins/adplug/adplug/flash.cpp
@@ -219,9 +219,9 @@ float CxadflashPlayer::xadplayer_getrefresh()
return 17.5f;
}
-std::string CxadflashPlayer::xadplayer_gettype()
+const char * CxadflashPlayer::xadplayer_gettype()
{
- return std::string("xad: flash player");
+ return "xad: flash player";
}
unsigned int CxadflashPlayer::xadplayer_getinstruments()