From af3a25f572ce434d1c3eb849d06342048244dc35 Mon Sep 17 00:00:00 2001
From: Sigmund Augdal Helberg <sigmunau@videolan.org>
Date: Sun, 13 Oct 2002 14:26:48 +0000
Subject: [PATCH] modules/demux/util/id3*: fixed up some dead comments
modules/gui/kde/*: only set variable the user actually have changed when
apply is pressed in the preferences window.
---
modules/demux/util/id3.c | 6 ++---
modules/demux/util/id3tag.c | 6 ++---
modules/gui/kde/QConfigItem.cpp | 19 ++++++++++++-
modules/gui/kde/QConfigItem.h | 5 +++-
modules/gui/kde/preferences.cpp | 48 ++++++++++++++++++---------------
5 files changed, 54 insertions(+), 30 deletions(-)
diff --git a/modules/demux/util/id3.c b/modules/demux/util/id3.c
index 82844009a0de..9fd0ec8192cb 100644
--- a/modules/demux/util/id3.c
+++ b/modules/demux/util/id3.c
@@ -1,10 +1,10 @@
/*****************************************************************************
- * audio.c : mpeg audio Stream input module for vlc
+ * id3.c: simple id3 tag skipper
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: id3.c,v 1.1 2002/08/24 21:35:31 sigmunau Exp $
+ * $Id: id3.c,v 1.2 2002/10/13 14:26:48 sigmunau Exp $
*
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/demux/util/id3tag.c b/modules/demux/util/id3tag.c
index 6b462997bf72..1d79b600420b 100644
--- a/modules/demux/util/id3tag.c
+++ b/modules/demux/util/id3tag.c
@@ -1,10 +1,10 @@
/*****************************************************************************
- * audio.c : mpeg audio Stream input module for vlc
+ * id3tag.c: id3 tag parser/skipper based on libid3tag
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: id3tag.c,v 1.1 2002/08/24 21:35:31 sigmunau Exp $
+ * $Id: id3tag.c,v 1.2 2002/10/13 14:26:48 sigmunau Exp $
*
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/modules/gui/kde/QConfigItem.cpp b/modules/gui/kde/QConfigItem.cpp
index 71558482bcc8..fa8144dfebb3 100644
--- a/modules/gui/kde/QConfigItem.cpp
+++ b/modules/gui/kde/QConfigItem.cpp
@@ -2,7 +2,7 @@
* QConfigItem.cpp: The QConfigItem class
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: QConfigItem.cpp,v 1.2 2002/08/12 17:38:10 sigmunau Exp $
+ * $Id: QConfigItem.cpp,v 1.3 2002/10/13 14:26:47 sigmunau Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> Mon 12.08.2002
*
@@ -27,6 +27,7 @@ QConfigItem::QConfigItem(QObject *parent, QString name, int iType, int i_val) :
{
type = iType;
iVal = i_val;
+ bChanged = false;
}
QConfigItem::QConfigItem(QObject *parent, QString name, int iType, float f_val) :
@@ -34,6 +35,7 @@ QConfigItem::QConfigItem(QObject *parent, QString name, int iType, float f_val)
{
type = iType;
fVal = f_val;
+ bChanged = false;
}
QConfigItem::QConfigItem(QObject *parent, QString name, int iType, QString s_val) :
@@ -41,6 +43,7 @@ QConfigItem::QConfigItem(QObject *parent, QString name, int iType, QString s_val
{
type = iType;
sVal = s_val;
+ bChanged = false;
}
QConfigItem::~QConfigItem()
@@ -71,19 +74,33 @@ QString QConfigItem::sValue()
void QConfigItem::setValue(int val)
{
iVal = val;
+ bChanged = true;
}
void QConfigItem::setValue(float val)
{
fVal = val;
+ bChanged = true;
}
void QConfigItem::setValue(double val)
{
fVal = (float)val;
+ bChanged = true;
}
void QConfigItem::setValue(const QString &val)
{
sVal = val;
+ bChanged = true;
+}
+
+bool QConfigItem::changed()
+{
+ return bChanged;
+}
+
+void QConfigItem::resetChanged()
+{
+ bChanged = false;
}
diff --git a/modules/gui/kde/QConfigItem.h b/modules/gui/kde/QConfigItem.h
index 408f5625c493..9600556725a9 100644
--- a/modules/gui/kde/QConfigItem.h
+++ b/modules/gui/kde/QConfigItem.h
@@ -2,7 +2,7 @@
* QConfigItem.h : includes for the QConfigItem class
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: QConfigItem.h,v 1.2 2002/08/12 17:38:10 sigmunau Exp $
+ * $Id: QConfigItem.h,v 1.3 2002/10/13 14:26:47 sigmunau Exp $
*
* Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001
*
@@ -42,16 +42,19 @@ class QConfigItem : public QObject
float fValue();
int iValue();
QString sValue();
+ bool changed();
public slots:
void setValue(int val);
void setValue(float val);
void setValue(double val);
void setValue(const QString &val);
+ void resetChanged();
private:
int iVal, type;
float fVal;
QString sVal;
+ bool bChanged;
};
#endif
diff --git a/modules/gui/kde/preferences.cpp b/modules/gui/kde/preferences.cpp
index 8633b85def14..24ef1059680d 100644
--- a/modules/gui/kde/preferences.cpp
+++ b/modules/gui/kde/preferences.cpp
@@ -2,7 +2,7 @@
* preferences.cpp: preferences window for the kde gui
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: preferences.cpp,v 1.6 2002/10/10 19:34:06 sigmunau Exp $
+ * $Id: preferences.cpp,v 1.7 2002/10/13 14:26:47 sigmunau Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> Mon Aug 12 2002
*
@@ -183,10 +183,10 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
QConfigItem *ci = new QConfigItem(this, p_item->psz_name,
p_item->i_type,
p_item->i_value);
+ item_adj->setValue( p_item->i_value );
connect(item_adj, SIGNAL(valueChanged( int)),
ci, SLOT(setValue(int)));
QToolTip::add(item_adj, p_item->psz_longtext);
- item_adj->setValue( p_item->i_value );
}
break;
@@ -281,29 +281,33 @@ void KPreferences::slotApply()
while ( (obj=it.current()) != 0 ) {
++it;
QConfigItem *p_config = (QConfigItem *)obj;
- msg_Dbg( p_intf, const_cast<char *>(p_config->name()));
- msg_Dbg( p_intf, "%d", p_config->getType());
+ if ( p_config->changed() )
+ {
+ msg_Dbg( p_intf, const_cast<char *>(p_config->name()));
+ msg_Dbg( p_intf, "%d", p_config->getType());
- switch( p_config->getType() ) {
+ switch( p_config->getType() ) {
- case CONFIG_ITEM_STRING:
- case CONFIG_ITEM_FILE:
- case CONFIG_ITEM_MODULE:
- if (p_config->sValue()) {
- config_PutPsz( p_intf, p_config->name(),
- strdup(p_config->sValue().latin1()));
- }
- else {
- config_PutPsz( p_intf, p_config->name(), NULL );
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_MODULE:
+ if (p_config->sValue()) {
+ config_PutPsz( p_intf, p_config->name(),
+ strdup(p_config->sValue().latin1()));
+ }
+ else {
+ config_PutPsz( p_intf, p_config->name(), NULL );
+ }
+ break;
+ case CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_BOOL:
+ config_PutInt( p_intf, p_config->name(), p_config->iValue() );
+ break;
+ case CONFIG_ITEM_FLOAT:
+ config_PutFloat( p_intf, p_config->name(), p_config->fValue() );
+ break;
}
- break;
- case CONFIG_ITEM_INTEGER:
- case CONFIG_ITEM_BOOL:
- config_PutInt( p_intf, p_config->name(), p_config->iValue() );
- break;
- case CONFIG_ITEM_FLOAT:
- config_PutFloat( p_intf, p_config->name(), p_config->fValue() );
- break;
+ p_config->resetChanged();
}
}
delete l;
--
GitLab