hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

stable backport of various fixes from trunk

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.4@1972 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2009-01-27 00:21:37 +00:00
parent 4fefc16f4b
commit 8b3d3f33a7
6 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@@ -1,3 +1,18 @@
2009-01-25 Paul Giblock <drfaygo/at/gmail/dot/com>
* src/tracks/bb_track.cpp:
Integrate broken BB-clone bug from pitanga
2009-01-25 Paul Giblock <drfaygo/at/gmail/dot/com>
* src/gui/widgets/knob.cpp:
Fix infinite recursion on Mac OSX
* plugins/flp_import/unrtf/html.c:
* plugins/flp_import/unrtf/output.h:
* plugins/flp_import/unrtf/convert.c:
Avoid compile warnings
2008-12-22 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* CMakeLists.txt:

2
plugins/flp_import/unrtf/convert.c
View File

@@ -2399,7 +2399,7 @@ static int cmd_ansi (Word *w, int align, char has_param, int param) {
*=======================================================================*/
static int cmd_ansicpg (Word *w, int align, char has_param, int param) {
int i;
unsigned int i;
for (i = 0; i < sizeof(codepages) / sizeof(CodepageInfo); i ++) {
charset_codepage = &codepages[i];
if (charset_codepage->cp == param) {

2
plugins/flp_import/unrtf/html.c
View File

@@ -877,7 +877,7 @@ static const char* cp850 [] = {
/* 0xff */ "&nbsp;",
};
#if 1 /* daved - 0.20.3 */
static char * Greek[] =
static const char * Greek[] =
{
/* 0x80 */ "&ccedil;",
/* 0x81 */ "&uuml;",

2
plugins/flp_import/unrtf/output.h
View File

@@ -285,7 +285,7 @@ typedef struct {
#if 1 /* daved 0.20.3 GREEK font support */
short greek_first_char;
short greek_last_char;
char **greek_translation_table;
const char **greek_translation_table;
#endif
char *(*unisymbol_print) (unsigned short);

2
src/gui/widgets/knob.cpp
View File

@@ -474,7 +474,7 @@ void knob::mousePressEvent( QMouseEvent * _me )
void knob::mouseMoveEvent( QMouseEvent * _me )
{
if( m_buttonPressed == TRUE )
if( m_buttonPressed == TRUE && _me->pos() != m_origMousePos )
{
setPosition( _me->pos() );
emit sliderMoved( model()->value() );

2
src/tracks/bb_track.cpp
View File

@@ -455,7 +455,7 @@ void bbTrack::loadTrackSpecificSettings( const QDomElement & _this )
if( _this.hasAttribute( "clonebbt" ) )
{
const int src = _this.attribute( "clonebb" ).toInt();
const int src = _this.attribute( "clonebbt" ).toInt();
const int dst = s_infoMap[this];
engine::getBBTrackContainer()->createTCOsForBB( dst );
trackContainer::trackList tl =