aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--guilib/GUIButtonScroller.cpp10
-rw-r--r--guilib/GUIFixedListContainer.cpp2
-rw-r--r--guilib/GUIProgressControl.cpp3
-rw-r--r--guilib/Texture.cpp3
-rw-r--r--xbmc/FileSystem/FileShoutcast.cpp3
-rw-r--r--xbmc/FileSystem/RSSDirectory.cpp2
-rw-r--r--xbmc/FileSystem/XBMSDirectory.cpp3
-rw-r--r--xbmc/FileSystem/iso9660.cpp3
-rw-r--r--xbmc/WinSystem.cpp4
-rw-r--r--xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp4
-rw-r--r--xbmc/cores/dvdplayer/DVDPlayerAudio.cpp2
-rw-r--r--xbmc/cores/paplayer/ADPCMCodec/ADPCMDll.cpp4
-rw-r--r--xbmc/karaoke/karaokelyricstext.cpp3
-rw-r--r--xbmc/linux/PlatformDefs.h2
-rw-r--r--xbmc/utils/ArabicShaping.cpp2
-rw-r--r--xbmc/utils/LCD.cpp2
-rw-r--r--xbmc/utils/PerformanceSample.cpp4
-rw-r--r--xbmc/utils/RssReader.cpp3
-rw-r--r--xbmc/utils/Teletext.cpp18
-rw-r--r--xbmc/utils/TuxBoxUtil.cpp9
20 files changed, 23 insertions, 63 deletions
diff --git a/guilib/GUIButtonScroller.cpp b/guilib/GUIButtonScroller.cpp
index 46f275a2c7..cfc75acd9f 100644
--- a/guilib/GUIButtonScroller.cpp
+++ b/guilib/GUIButtonScroller.cpp
@@ -719,14 +719,12 @@ void CGUIButtonScroller::RenderItem(float &posX, float &posY, int &iOffset, bool
color_t color = (m_label.focusedColor && iOffset == GetActiveButton()) ? m_label.focusedColor : m_label.textColor;
color_t blendedAlpha = (alpha * ((color & 0xff000000) >> 24)) / 255;
color_t blendedColor = (blendedAlpha << 24) | (color & 0xFFFFFF);
- blendedAlpha = (alpha * ((m_label.shadowColor & 0xff000000) >> 24)) / 255;
color_t shadowColor = (alpha << 24) | (m_label.shadowColor & 0xFFFFFF);
CGUITextLayout::DrawText(m_label.font, fPosX, fPosY, blendedColor, shadowColor, label, m_label.align);
}
else
{
float fAlpha = 255.0f;
- float fAlpha1 = 255.0f;
// check if we have a skinner-defined texture...
CGUITexture *pImage = m_vecButtons[iOffset]->imageNoFocus;
if (!pImage) pImage = &m_imgNoFocus;
@@ -737,17 +735,13 @@ void CGUIButtonScroller::RenderItem(float &posX, float &posY, int &iOffset, bool
if (posX < fStartAlpha)
{
fAlpha -= (fStartAlpha - posX) / (fStartAlpha - m_posX) * m_iAlpha * 2.55f;
- fAlpha1 -= (fStartAlpha - (posX + m_imgFocus.GetWidth() + m_buttonGap)) / (fStartAlpha - m_posX) * m_iAlpha * 2.55f;
}
if (posX >= fEndAlpha)
{
fAlpha -= (posX - fEndAlpha) / (m_posX + m_width - fEndAlpha) * m_iAlpha * 2.55f;
- fAlpha1 -= ((posX + m_imgFocus.GetWidth() + m_buttonGap) - fEndAlpha) / (m_posX + m_width - fEndAlpha) * m_iAlpha * 2.55f;
}
if (fAlpha < 0) fAlpha = 0;
- if (fAlpha1 < 0) fAlpha1 = 0;
if (fAlpha > 255) fAlpha = 255.0f;
- if (fAlpha1 > 255) fAlpha1 = 255.0f;
pImage->SetAlpha((unsigned char)(fAlpha + 0.5f));
}
else
@@ -755,17 +749,13 @@ void CGUIButtonScroller::RenderItem(float &posX, float &posY, int &iOffset, bool
if (posY < fStartAlpha)
{
fAlpha -= (fStartAlpha - posY) / (fStartAlpha - m_posY) * m_iAlpha * 2.55f;
- fAlpha1 -= (fStartAlpha - (posY + m_imgFocus.GetHeight() + m_buttonGap)) / (fStartAlpha - m_posY) * m_iAlpha * 2.55f;
}
if (posY > fEndAlpha)
{
fAlpha -= (posY - fEndAlpha) / (m_posY + m_height - fEndAlpha) * m_iAlpha * 2.55f;
- fAlpha1 -= ((posY + m_imgFocus.GetHeight() + m_buttonGap) - fEndAlpha) / (m_posY + m_height - fEndAlpha) * m_iAlpha * 2.55f;
}
if (fAlpha < 0) fAlpha = 0;
- if (fAlpha1 < 0) fAlpha1 = 0;
if (fAlpha > 255) fAlpha = 255.0f;
- if (fAlpha1 > 255) fAlpha1 = 255.0f;
pImage->SetAlpha((unsigned char)(fAlpha + 0.5f));
}
pImage->SetPosition(posX, posY);
diff --git a/guilib/GUIFixedListContainer.cpp b/guilib/GUIFixedListContainer.cpp
index 1c10eb6781..6e1453a9b5 100644
--- a/guilib/GUIFixedListContainer.cpp
+++ b/guilib/GUIFixedListContainer.cpp
@@ -261,7 +261,7 @@ void CGUIFixedListContainer::SelectItem(int item)
int minCursor, maxCursor;
GetCursorRange(minCursor, maxCursor);
- int cursor = m_cursor;
+ int cursor;
if ((int)m_items.size() - 1 - item <= maxCursor - m_fixedCursor)
cursor = std::max(m_fixedCursor, maxCursor + item - (int)m_items.size() + 1);
else if (item <= m_fixedCursor - minCursor)
diff --git a/guilib/GUIProgressControl.cpp b/guilib/GUIProgressControl.cpp
index 836b3e8aa3..f322040780 100644
--- a/guilib/GUIProgressControl.cpp
+++ b/guilib/GUIProgressControl.cpp
@@ -76,8 +76,6 @@ void CGUIProgressControl::Render()
fScaleY = m_guiBackground.GetTextureHeight() ? m_height / m_guiBackground.GetTextureHeight() : 1.0f;
fScaleX = m_guiBackground.GetTextureWidth() ? m_width / m_guiBackground.GetTextureWidth() : 1.0f;
- float fWidth = m_fPercent;
-
float posX = m_guiBackground.GetXPosition();
float posY = m_guiBackground.GetYPosition();
@@ -104,7 +102,6 @@ void CGUIProgressControl::Render()
m_guiMid.SetWidth(width);
m_guiMid.Render();
}
- posX += fWidth * fScaleX;
}
}
else
diff --git a/guilib/Texture.cpp b/guilib/Texture.cpp
index 3f2a5b22dd..e42daaa0ef 100644
--- a/guilib/Texture.cpp
+++ b/guilib/Texture.cpp
@@ -33,9 +33,6 @@
CBaseTexture::CBaseTexture(unsigned int width, unsigned int height, unsigned int format)
: m_hasAlpha( true )
{
-#ifndef HAS_DX
- m_texture = NULL;
-#endif
m_pixels = NULL;
m_loadedToGPU = false;
Allocate(width, height, format);
diff --git a/xbmc/FileSystem/FileShoutcast.cpp b/xbmc/FileSystem/FileShoutcast.cpp
index a941ebd7b3..70a559b9a7 100644
--- a/xbmc/FileSystem/FileShoutcast.cpp
+++ b/xbmc/FileSystem/FileShoutcast.cpp
@@ -216,7 +216,6 @@ int64_t CFileShoutcast::GetLength()
bool CFileShoutcast::Open(const CURL& url)
{
m_lastTime = CTimeUtils::GetTimeMS();
- int ret;
CGUIDialogProgress* dlgProgress = NULL;
@@ -260,7 +259,7 @@ bool CFileShoutcast::Open(const CURL& url)
dlgProgress->Progress();
}
- if ((ret = rip_manager_start(rip_callback, &m_opt)) != SR_SUCCESS)
+ if (rip_manager_start(rip_callback, &m_opt) != SR_SUCCESS)
{
if (dlgProgress) dlgProgress->Close();
return false;
diff --git a/xbmc/FileSystem/RSSDirectory.cpp b/xbmc/FileSystem/RSSDirectory.cpp
index 1b0cef962e..59c50f48a9 100644
--- a/xbmc/FileSystem/RSSDirectory.cpp
+++ b/xbmc/FileSystem/RSSDirectory.cpp
@@ -498,7 +498,7 @@ static void ParseItem(CFileItem* item, TiXmlElement* root, const CStdString& pat
{
if(best == resources.end())
best = it;
- else if(it->width && it->height || best->width && best->height)
+ else if((it->width && it->height) || (best->width && best->height))
{
if(it->width*it->height > best->width*best->height)
best = it;
diff --git a/xbmc/FileSystem/XBMSDirectory.cpp b/xbmc/FileSystem/XBMSDirectory.cpp
index a28f4d9ba4..94a2c78de4 100644
--- a/xbmc/FileSystem/XBMSDirectory.cpp
+++ b/xbmc/FileSystem/XBMSDirectory.cpp
@@ -61,7 +61,6 @@ bool CXBMSDirectory::GetDirectory(const CStdString& strPathUtf8, CFileItemList &
{
unsigned long handle;
char *filename, *fileinfo;
- bool rv = false;
CStdString strPath=strPathUtf8;
g_charsetConverter.utf8ToStringCharset(strPath);
@@ -87,7 +86,6 @@ bool CXBMSDirectory::GetDirectory(const CStdString& strPathUtf8, CFileItemList &
dc_context.username = ((strUserName.c_str() != NULL) && (strlen(strUserName.c_str()) > 0)) ? strUserName.c_str() : NULL;
dc_context.password = ((strPassword.c_str() != NULL) && (strlen(strPassword.c_str()) > 0)) ? strPassword.c_str() : NULL;
ccx_client_discover_servers(DiscoveryCallback, (void *)(&dc_context));
- rv = S_OK;
return (items.Size()>iOldSize);
}
@@ -230,7 +228,6 @@ bool CXBMSDirectory::GetDirectory(const CStdString& strPathUtf8, CFileItemList &
free(fileinfo);
}
cc_xstream_client_close_all(conn);
- rv = true;
if (conn != 0)
cc_xstream_client_disconnect(conn);
diff --git a/xbmc/FileSystem/iso9660.cpp b/xbmc/FileSystem/iso9660.cpp
index a9f53a1a85..0843bd3c76 100644
--- a/xbmc/FileSystem/iso9660.cpp
+++ b/xbmc/FileSystem/iso9660.cpp
@@ -835,14 +835,11 @@ bool iso9660::ReadSectorFromCache(iso9660::isofile* pContext, DWORD sector, byte
if ( pContext->m_dwCircBuffBegin >= CIRC_BUFFER_SIZE )
pContext->m_dwCircBuffBegin -= CIRC_BUFFER_SIZE;
pContext->m_dwCircBuffSectorStart++;
- SectorsInCircBuff--;
}
else
{
pContext->m_dwCircBuffBegin = pContext->m_dwCircBuffEnd = 0;
pContext->m_dwCircBuffSectorStart = 0;
- SectorsInCircBuff = 0;
- SectorIsAdjacentInBuffer = 0;
}
}
// Ok, we're ready to read the sector into the cache
diff --git a/xbmc/WinSystem.cpp b/xbmc/WinSystem.cpp
index 83ac290fc5..cc2f1bdb43 100644
--- a/xbmc/WinSystem.cpp
+++ b/xbmc/WinSystem.cpp
@@ -151,8 +151,8 @@ static void AddRefreshRate(vector<REFRESHRATE> &refreshrates, unsigned int addin
static bool rrSortPredicate (REFRESHRATE i, REFRESHRATE j)
{
- return ( i.RefreshRate < j.RefreshRate
- || i.RefreshRate == j.RefreshRate && !i.Interlaced);
+ return ( (i.RefreshRate < j.RefreshRate)
+ || (i.RefreshRate == j.RefreshRate && !i.Interlaced));
}
vector<REFRESHRATE> CWinSystemBase::RefreshRates(int screen, int width, int height)
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
index 967442fe99..c1164215c4 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
@@ -254,9 +254,9 @@ DVDVideoPicture* CDVDCodecUtils::ConvertToYUV422PackedPicture(DVDVideoPicture *p
{
// Perform the scaling.
uint8_t* src[] = { pSrc->data[0], pSrc->data[1], pSrc->data[2], NULL };
- int srcStride[] = { pSrc->iLineSize[0], pSrc->iLineSize[1], pSrc->iLineSize[2], NULL };
+ int srcStride[] = { pSrc->iLineSize[0], pSrc->iLineSize[1], pSrc->iLineSize[2], 0 };
uint8_t* dst[] = { pPicture->data[0], NULL, NULL, NULL };
- int dstStride[] = { pPicture->iLineSize[0], NULL, NULL, NULL };
+ int dstStride[] = { pPicture->iLineSize[0], 0, 0, 0 };
int dstformat;
if (format == DVDVideoPicture::FMT_UYVY)
diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
index 7aac5c5a11..c7b59cdaef 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
+++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp
@@ -562,7 +562,7 @@ void CDVDPlayerAudio::Process()
// Zero out the frame data if we are supposed to silence the audio
if (m_silence)
- memset(audioframe.data, NULL, audioframe.size);
+ memset(audioframe.data, 0, audioframe.size);
if( result & DECODE_FLAG_DROP )
{
diff --git a/xbmc/cores/paplayer/ADPCMCodec/ADPCMDll.cpp b/xbmc/cores/paplayer/ADPCMCodec/ADPCMDll.cpp
index deb03a8b7c..a5db26296e 100644
--- a/xbmc/cores/paplayer/ADPCMCodec/ADPCMDll.cpp
+++ b/xbmc/cores/paplayer/ADPCMCodec/ADPCMDll.cpp
@@ -71,7 +71,7 @@ extern "C"
if (!info->f)
{
free(info);
- return NULL;
+ return 0;
}
int iResult = getwavinfo(info);
@@ -79,7 +79,7 @@ extern "C"
{
fclose(info->f);
free(info);
- return NULL;
+ return 0;
}
info->szBuf = (char*)malloc(XBOX_ADPCM_DSTSIZE*info->fmt.wChannels*4);
diff --git a/xbmc/karaoke/karaokelyricstext.cpp b/xbmc/karaoke/karaokelyricstext.cpp
index 3c36723978..f00e177b19 100644
--- a/xbmc/karaoke/karaokelyricstext.cpp
+++ b/xbmc/karaoke/karaokelyricstext.cpp
@@ -375,7 +375,6 @@ void CKaraokeLyricsText::Render()
}
m_preambleLayout->Update( m_currentPreamble, maxWidth * 0.9f );
- updatePreamble = false;
}
float x = maxWidth * 0.5f + g_settings.m_ResInfo[resolution].Overscan.left;
@@ -462,7 +461,7 @@ void CKaraokeLyricsText::rescanLyrics()
}
// Second, add spaces if less than 5%, and rescan to gather more data.
- bool add_spaces = (spaces * 100 / syllables < 5) ? true : false;
+ bool add_spaces = (syllables && (spaces * 100 / syllables < 5)) ? true : false;
RESOLUTION res = g_graphicsContext.GetVideoResolution();
float maxWidth = (float) g_settings.m_ResInfo[res].Overscan.right - g_settings.m_ResInfo[res].Overscan.left;
diff --git a/xbmc/linux/PlatformDefs.h b/xbmc/linux/PlatformDefs.h
index c59afc2c81..f7338dd843 100644
--- a/xbmc/linux/PlatformDefs.h
+++ b/xbmc/linux/PlatformDefs.h
@@ -184,7 +184,7 @@
typedef pthread_t ThreadIdentifier;
-class CXHandle; // foward declaration
+struct CXHandle; // forward declaration
typedef CXHandle* HANDLE;
typedef void* HINSTANCE;
diff --git a/xbmc/utils/ArabicShaping.cpp b/xbmc/utils/ArabicShaping.cpp
index db15a056d9..966c404415 100644
--- a/xbmc/utils/ArabicShaping.cpp
+++ b/xbmc/utils/ArabicShaping.cpp
@@ -192,7 +192,7 @@ static fribidi_boolean IsTransparent(FriBidiChar c)
FriBidiChar* shape_arabic(FriBidiChar * str, int len)
{
- CharRep crep;
+ CharRep crep = { 0 };
CombCharRep combcrep;
FriBidiChar * shaped =
(FriBidiChar *) malloc(sizeof(FriBidiChar) * (len + 1));
diff --git a/xbmc/utils/LCD.cpp b/xbmc/utils/LCD.cpp
index 48be32dcd1..ffb0c48bb8 100644
--- a/xbmc/utils/LCD.cpp
+++ b/xbmc/utils/LCD.cpp
@@ -174,7 +174,6 @@ CStdString ILCD::GetProgressBar(double tCurrent, double tTotal)
if (m_iColumns > 0)
{
double dBlockSize = tTotal * 0.99 / m_iColumns / iBigBlock; // mult with 0.99 to show the last bar
- double dBlockSizeRest = (tCurrent - ((int)(tCurrent / dBlockSize) * dBlockSize));
CStdString strProgressBar = "[";
for (int i = 1;i <= m_iColumns;i++)
@@ -191,7 +190,6 @@ CStdString ILCD::GetProgressBar(double tCurrent, double tTotal)
tmpTest = (tmpTest / dBlockSize);
if (tmpTest >= iBigBlock) tmpTest = iBigBlock - 1;
strProgressBar += char(cLCDsmallBlocks - (int)tmpTest);
- dBlockSizeRest = 0;
}
//fill up the rest with blanks
else
diff --git a/xbmc/utils/PerformanceSample.cpp b/xbmc/utils/PerformanceSample.cpp
index 79bfdb356c..f6a9dde580 100644
--- a/xbmc/utils/PerformanceSample.cpp
+++ b/xbmc/utils/PerformanceSample.cpp
@@ -62,11 +62,10 @@ void CPerformanceSample::Reset()
void CPerformanceSample::CheckPoint()
{
+#ifdef HAS_PERFORMANCE_SAMPLE
int64_t tmNow;
tmNow = CurrentHostCounter();
-#ifdef HAS_PERFORMANCE_SAMPLE
double elapsed = (double)(tmNow - m_tmStart) / (double)m_tmFreq.QuadPart;
-#endif
double dUser=0.0, dSys=0.0;
#ifdef _LINUX
@@ -82,7 +81,6 @@ void CPerformanceSample::CheckPoint()
}
#endif
-#ifdef HAS_PERFORMANCE_SAMPLE
g_application.GetPerformanceStats().AddSample(m_statName, PerformanceCounter(elapsed,dUser,dSys));
#endif
diff --git a/xbmc/utils/RssReader.cpp b/xbmc/utils/RssReader.cpp
index 4bc96eced2..a594d8fd0f 100644
--- a/xbmc/utils/RssReader.cpp
+++ b/xbmc/utils/RssReader.cpp
@@ -254,8 +254,6 @@ void CRssReader::GetNewsItems(TiXmlElement* channelXmlNode, int iFeed)
typedef pair <CStdString, CStdStringW> StrPair;
list <CStdString>::iterator i;
- bool bEmpty=true;
-
// Add the title tag in if we didn't pass any tags in at all
// Represents default behaviour before configurability
@@ -264,7 +262,6 @@ void CRssReader::GetNewsItems(TiXmlElement* channelXmlNode, int iFeed)
while (itemNode > 0)
{
- bEmpty = false;
TiXmlNode* childNode = itemNode->FirstChild();
mTagElements.clear();
while (childNode > 0)
diff --git a/xbmc/utils/Teletext.cpp b/xbmc/utils/Teletext.cpp
index 2a77435eb4..37fc041c96 100644
--- a/xbmc/utils/Teletext.cpp
+++ b/xbmc/utils/Teletext.cpp
@@ -647,7 +647,7 @@ bool CTeletextDecoder::InitDecoder()
m_TypeTTF.face_id = (FTC_FaceID) m_teletextFont.c_str();
m_TypeTTF.height = (FT_UShort) m_RenderInfo.FontHeight;
m_TypeTTF.flags = FT_LOAD_MONOCHROME;
- if ((error = FTC_Manager_LookupFace(m_Manager, m_TypeTTF.face_id, &m_Face)))
+ if (FTC_Manager_LookupFace(m_Manager, m_TypeTTF.face_id, &m_Face))
{
m_TypeTTF.face_id = (FTC_FaceID) m_teletextFont.c_str();
if ((error = FTC_Manager_LookupFace(m_Manager, m_TypeTTF.face_id, &m_Face)))
@@ -733,7 +733,6 @@ void CTeletextDecoder::EndDecoder()
void CTeletextDecoder::PageInput(int Number)
{
- int zoom = 0;
m_updateTexture = true;
/* clear m_TempPage */
@@ -759,9 +758,6 @@ void CTeletextDecoder::PageInput(int Number)
CopyBB2FB();
}
- if (m_RenderInfo.ZoomMode == 1)
- zoom = 1<<10;
-
m_RenderInfo.PosY = 0;
switch (m_RenderInfo.InputCounter)
@@ -785,7 +781,7 @@ void CTeletextDecoder::PageInput(int Number)
}
/* generate pagenumber */
- m_TempPage |= Number << m_RenderInfo.InputCounter*4;
+ m_TempPage |= Number << (m_RenderInfo.InputCounter*4);
m_RenderInfo.InputCounter--;
@@ -2179,7 +2175,7 @@ void CTeletextDecoder::DrawShape(color_t *lfb, int xres, int x, int y, int shape
void CTeletextDecoder::RenderCharIntern(TextRenderInfo_t* RenderInfo, int Char, TextPageAttr_t *Attribute, int zoom, int yoffset)
{
int Row, Pitch;
- int error, glyph;
+ int glyph;
color_t bgcolor, fgcolor;
int factor, xfactor;
unsigned char *sbitbuffer;
@@ -2227,7 +2223,7 @@ void CTeletextDecoder::RenderCharIntern(TextRenderInfo_t* RenderInfo, int Char,
return;
}
- if ((error = FTC_SBitCache_Lookup(m_Cache, &m_TypeTTF, glyph, &m_sBit, NULL)) != 0)
+ if (FTC_SBitCache_Lookup(m_Cache, &m_TypeTTF, glyph, &m_sBit, NULL) != 0)
{
FillRect(m_TextureBuffer, m_RenderInfo.Width, m_RenderInfo.PosX, m_RenderInfo.PosY + yoffset, curfontwidth, m_RenderInfo.FontHeight, bgcolor);
m_RenderInfo.PosX += curfontwidth;
@@ -2254,7 +2250,7 @@ void CTeletextDecoder::RenderCharIntern(TextRenderInfo_t* RenderInfo, int Char,
Char = G2table[0][0x20+ Attribute->diacrit];
if ((glyph = FT_Get_Char_Index(m_Face, Char)))
{
- if ((error = FTC_SBitCache_Lookup(m_Cache, &m_TypeTTF, glyph, &sbit_diacrit, NULL)) == 0)
+ if (FTC_SBitCache_Lookup(m_Cache, &m_TypeTTF, glyph, &sbit_diacrit, NULL) == 0)
{
sbitbuffer = localbuffer;
memcpy(sbitbuffer,m_sBit->buffer,m_sBit->pitch*m_sBit->height);
@@ -2798,7 +2794,6 @@ TextPageinfo_t* CTeletextDecoder::DecodePage(bool showl25, // 1=deco
PageAtrb[col] = atr;
for (col = 40; col < 24*40; col++)
PageChar[col] = number2char(PageChar[col]);
- boxed = false;
return PageInfo; /* don't interpret irregular pages */
}
else if (PageInfo->function == FUNC_GPOP || PageInfo->function == FUNC_POP) /* object definitions */
@@ -2826,12 +2821,10 @@ TextPageinfo_t* CTeletextDecoder::DecodePage(bool showl25, // 1=deco
}
}
}
- boxed = false;
return PageInfo; /* don't interpret irregular pages */
}
else if (PageInfo->function == FUNC_GDRCS || PageInfo->function == FUNC_DRCS) /* character definitions */
{
- boxed = false;
return PageInfo; /* don't interpret irregular pages */
}
else
@@ -2865,7 +2858,6 @@ TextPageinfo_t* CTeletextDecoder::DecodePage(bool showl25, // 1=deco
}
if (parityerror)
{
- boxed = false;
return PageInfo; /* don't interpret irregular pages */
}
}
diff --git a/xbmc/utils/TuxBoxUtil.cpp b/xbmc/utils/TuxBoxUtil.cpp
index a785e3ca14..d9c9a4d403 100644
--- a/xbmc/utils/TuxBoxUtil.cpp
+++ b/xbmc/utils/TuxBoxUtil.cpp
@@ -1533,7 +1533,6 @@ CStdString CTuxBoxUtil::GetSubMode(int iMode, CStdString& strXMLRootString, CStd
// MODE: 0 = TV, 1 = Radio, 2 = Data, 3 = Movies, 4 = Root
// SUBMODE: 0 = n/a, 1 = All, 2 = Satellites, 2 = Providers, 4 = Bouquets
// Default Submode
- int iSubmode = 4;
CStdString strSubMode;
if(iMode <0 || iMode >4)
@@ -1559,23 +1558,23 @@ CStdString CTuxBoxUtil::GetSubMode(int iMode, CStdString& strXMLRootString, CStd
strXMLRootString.Format("services");
strXMLChildString.Format("service");
}
- else if (iSubmode == 2)
+ else if (iSubMode == 2)
{
strXMLRootString.Format("satellites");
strXMLChildString.Format("satellite");
}
- else if (iSubmode == 3)
+ else if (iSubMode == 3)
{
strXMLRootString.Format("providers");
strXMLChildString.Format("provider");
}
- else // if (iSubmode == 4 || iSubMode < 0)
+ else // if (iSubMode == 4 || iSubMode < 0)
{
iSubMode = 4;
strXMLRootString.Format("bouquets");
strXMLChildString.Format("bouquet");
}
- strSubMode.Format("xml/services?mode=%i&submode=%i",iMode,iSubmode);
+ strSubMode.Format("xml/services?mode=%i&submode=%i",iMode,iSubMode);
return strSubMode;
}
//Input: url/path of share/item file/folder
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-13 10:01:36 +0000