From jerrytansun at helixcommunity.org Fri Feb 1 00:34:04 2008
From: jerrytansun at helixcommunity.org (jerrytansun@helixcommunity.org)
Date: Thu Jan 31 23:48:42 2008
Subject: [Player-cvs]
app/gtk main_interface.c, 1.59, 1.60 setup_interface.c, 1.26, 1.27
Message-ID:
Update of /cvsroot/player/app/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv9807
Modified Files:
main_interface.c setup_interface.c
Log Message:
fix bug for 7252, 6088
patch by jerry.tan reviewed by dyek
Index: main_interface.c
===================================================================
RCS file: /cvsroot/player/app/gtk/main_interface.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- main_interface.c 13 Mar 2007 22:17:26 -0000 1.59
+++ main_interface.c 1 Feb 2008 08:34:01 -0000 1.60
@@ -533,7 +533,7 @@
gtk_widget_set_name (hmw_tools_menu_menu, "hmw_tools_menu_menu");
gtk_menu_item_set_submenu (GTK_MENU_ITEM (hmw_tools_menu), hmw_tools_menu_menu);
- hmw_playlist_menu_item = gtk_check_menu_item_new_with_mnemonic (_("_Playlist Editor"));
+ hmw_playlist_menu_item = gtk_check_menu_item_new_with_mnemonic (_("Playlist _Editor"));
gtk_widget_set_name (hmw_playlist_menu_item, "hmw_playlist_menu_item");
gtk_widget_show (hmw_playlist_menu_item);
gtk_container_add (GTK_CONTAINER (hmw_tools_menu_menu), hmw_playlist_menu_item);
Index: setup_interface.c
===================================================================
RCS file: /cvsroot/player/app/gtk/setup_interface.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- setup_interface.c 31 Oct 2006 22:09:48 -0000 1.26
+++ setup_interface.c 1 Feb 2008 08:34:01 -0000 1.27
@@ -367,7 +367,7 @@
gtk_box_pack_start (GTK_BOX (hsa_almost_finished_vbox), hsa_update_and_mozilla_vbox, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (hsa_update_and_mozilla_vbox), 10);
- hsad_check_for_updates_checkbox = gtk_check_button_new_with_mnemonic (_("_Check for updates"));
+ hsad_check_for_updates_checkbox = gtk_check_button_new_with_mnemonic (_("Check for _updates"));
gtk_widget_set_name (hsad_check_for_updates_checkbox, "hsad_check_for_updates_checkbox");
gtk_widget_show (hsad_check_for_updates_checkbox);
gtk_box_pack_start (GTK_BOX (hsa_update_and_mozilla_vbox), hsad_check_for_updates_checkbox, FALSE, FALSE, 0);
From jerrytansun at helixcommunity.org Fri Feb 1 00:34:05 2008
From: jerrytansun at helixcommunity.org (jerrytansun@helixcommunity.org)
Date: Thu Jan 31 23:48:42 2008
Subject: [Player-cvs] app/gtk/res setup.glade, 1.14, 1.15 main.glade, 1.58,
1.59
Message-ID:
Update of /cvsroot/player/app/gtk/res
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv9807/res
Modified Files:
setup.glade main.glade
Log Message:
fix bug for 7252, 6088
patch by jerry.tan reviewed by dyek
Index: main.glade
===================================================================
RCS file: /cvsroot/player/app/gtk/res/main.glade,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- main.glade 13 Mar 2007 22:17:27 -0000 1.58
+++ main.glade 1 Feb 2008 08:34:02 -0000 1.59
@@ -553,7 +553,7 @@
-
-
-
-
From idefix at helixcommunity.org Tue Feb 19 23:20:57 2008
From: idefix at helixcommunity.org (idefix@helixcommunity.org)
Date: Tue Feb 19 22:30:51 2008
Subject: [Player-cvs] app/gtk open.cpp,1.14,1.15
Message-ID:
Update of /cvsroot/player/app/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv29252
Modified Files:
open.cpp
Log Message:
Modified by: chris.wang@sun.com
Date: 02:20:2008
Project: Porting solaris
Overview:
Community bugzilla bug id 7192 report that Realplayer cannot remember
the last location of the local file opened.
Actually, the original code was designed to do such a work, but there is
one slip that cause the code doesn't work.
In player/app/gtk/open.cpp, the gtk_file_chooser_dialog was create as
fs = gtk_file_chooser_dialog_new(select_files,
NULL,
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
*
*which means the response_id when press the open button is
GTK_RESPONSE_ACCEPT, but in the callback function
hxplay_open_file_dialog_response, it justify whether the response id is
GTK_RESPONSE_OK, then memorize the
LastBrowsedDirectory, which means, the code is never reached. Thus, the
last browsed directory has never been
memorized.
to fix the bug, simply change GTK_RESPONSE_OK to GTK_RESPONSE_ACCEPT
Files Modified:
Files Added:
Platforms and Profiles Affected:
Solaris and Linux
Distribution Libraries Affected:
realplay.bin
Distribution library impact and planned action:
no
Platforms and Profiles Build Verified:
Have verified on solaris 11 x86 , with
SYSTEM_ID=sunos-5.10-i386-studio10, profile as player-all
BIF : reaplayer_gtk_current
Profile: helix_client_all_defines
Branch : hxclient_1_5_0_cayenne
Copyright assignment:
1. My company (sun.com) submits this code under the terms
of a commercial contribution agreement with RealNetworks,
and I am authorized to contribute this code under said agreement.
Index: open.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/open.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- open.cpp 9 Nov 2007 19:24:55 -0000 1.14
+++ open.cpp 20 Feb 2008 07:20:54 -0000 1.15
@@ -157,7 +157,7 @@
g_return_if_fail(info != NULL);
g_return_if_fail(info->window != NULL);
- if(response_id == GTK_RESPONSE_OK)
+ if(response_id == GTK_RESPONSE_ACCEPT)
{
const gchar* str;
From dyek at helixcommunity.org Wed Feb 20 00:53:01 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 00:02:55 2008
Subject: [Player-cvs] common/gtk hxplayer.cpp, 1.62, 1.62.2.1 hxutil.cpp,
1.12, 1.12.18.1
Message-ID:
Update of /cvsroot/player/common/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv29093
Modified Files:
Tag: hxclient_2_0_5_cayenne
hxplayer.cpp hxutil.cpp
Log Message:
Refactor executable path code into hxutil.cpp.
Created:
hx_util_get_executable_path();
hx_util_get_executable_dir();
The first function returns the executable-binary path.
The second function returns the installation directory path.
Files Modified:
player/common/gtk/hxplayer.cpp
player/common/gtk/hxutil.cpp
player/common/gtk/pub/hxutil.h
Index: hxplayer.cpp
===================================================================
RCS file: /cvsroot/player/common/gtk/hxplayer.cpp,v
retrieving revision 1.62
retrieving revision 1.62.2.1
diff -u -d -r1.62 -r1.62.2.1
--- hxplayer.cpp 26 Dec 2007 10:09:58 -0000 1.62
+++ hxplayer.cpp 20 Feb 2008 08:52:58 -0000 1.62.2.1
@@ -80,8 +80,8 @@
#include "hx-i18n.h"
#include "hxstatisticsobserver.h"
-
#include "chxplaybackvelocityresponse.h"
+#include "hxutil.h"
extern "C"
{
@@ -1162,20 +1162,8 @@
}
// Default to executable path if HELIX_LIBS environment variable is not set.
- gchar *exec_sym_link = g_strdup_printf("/proc/%i/exe", getpid());
const gchar *helix_libs = g_getenv("HELIX_LIBS");
- gchar *assumed_helix_libs = NULL;
-
- if ( g_file_test(exec_sym_link, G_FILE_TEST_IS_SYMLINK) )
- {
- // Read executable path.
- gchar *t = g_file_read_link(exec_sym_link, NULL);
- if (t)
- {
- assumed_helix_libs = g_path_get_dirname(t);
- g_free(t);
- }
- }
+ gchar *assumed_helix_libs = hx_util_get_executable_dir();
if (!helix_libs)
{
@@ -1192,7 +1180,6 @@
g_setenv("HELIX_LIBS", assumed_helix_libs, FALSE); // No overwrite.
HX_G_FREE(assumed_helix_libs);
}
- HX_G_FREE(exec_sym_link);
/* Initialize the engine */
if(!ClientPlayerCreate(&player->helix_client_token,
Index: hxutil.cpp
===================================================================
RCS file: /cvsroot/player/common/gtk/hxutil.cpp,v
retrieving revision 1.12
retrieving revision 1.12.18.1
diff -u -d -r1.12 -r1.12.18.1
--- hxutil.cpp 6 Jul 2007 20:49:23 -0000 1.12
+++ hxutil.cpp 20 Feb 2008 08:52:58 -0000 1.12.18.1
@@ -64,6 +64,8 @@
#include // for mkdir()
#include // for mkdir()
+#include "hxgerror.h"
+
typedef enum
{
@@ -730,4 +732,39 @@
return success;
}
+// Return a string representing path to the currently executable.
+// Call g_free() when done to free the return value.
+gchar*
+hx_util_get_executable_path()
+{
+ gchar *exec_path = NULL;
+ gchar *exec_sym_link = g_strdup_printf("/proc/%i/exe", getpid());
+
+ if ( g_file_test(exec_sym_link, G_FILE_TEST_IS_SYMLINK) )
+ {
+ // Read executable path.
+ exec_path = g_file_read_link(exec_sym_link, NULL);
+ }
+ HX_G_FREE(exec_sym_link);
+
+ return exec_path;
+}
+
+// Return a string representing directory path to the currently executable.
+// Call g_free() when done to free the return value.
+gchar*
+hx_util_get_executable_dir()
+{
+ gchar *exec_dir = NULL;
+
+ // Read executable path.
+ gchar *t = hx_util_get_executable_path();
+ if (t)
+ {
+ exec_dir = g_path_get_dirname(t);
+ HX_G_FREE(t);
+ }
+
+ return exec_dir;
+}
From dyek at helixcommunity.org Wed Feb 20 00:53:01 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 00:02:55 2008
Subject: [Player-cvs] common/gtk/pub hxutil.h,1.9,1.9.18.1
Message-ID:
Update of /cvsroot/player/common/gtk/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv29093/pub
Modified Files:
Tag: hxclient_2_0_5_cayenne
hxutil.h
Log Message:
Refactor executable path code into hxutil.cpp.
Created:
hx_util_get_executable_path();
hx_util_get_executable_dir();
The first function returns the executable-binary path.
The second function returns the installation directory path.
Files Modified:
player/common/gtk/hxplayer.cpp
player/common/gtk/hxutil.cpp
player/common/gtk/pub/hxutil.h
Index: hxutil.h
===================================================================
RCS file: /cvsroot/player/common/gtk/pub/hxutil.h,v
retrieving revision 1.9
retrieving revision 1.9.18.1
diff -u -d -r1.9 -r1.9.18.1
--- hxutil.h 6 Jul 2007 20:50:00 -0000 1.9
+++ hxutil.h 20 Feb 2008 08:52:59 -0000 1.9.18.1
@@ -119,6 +119,8 @@
gboolean hx_mkdir_with_parents(gchar *dir, int mode);
+gchar* hx_util_get_executable_path();
+gchar* hx_util_get_executable_dir();
G_END_DECLS
From dyek at helixcommunity.org Wed Feb 20 01:03:18 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 00:13:16 2008
Subject: [Player-cvs] common/gtk hxplayer.cpp, 1.62, 1.63 hxutil.cpp, 1.12,
1.13
Message-ID:
Update of /cvsroot/player/common/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5222
Modified Files:
hxplayer.cpp hxutil.cpp
Log Message:
Merge from 205Cay.
Refactor executable path code into hxutil.cpp.
Created:
hx_util_get_executable_path();
hx_util_get_executable_dir();
The first function returns the executable-binary path.
The second function returns the installation directory path.
Files Modified:
player/common/gtk/hxplayer.cpp
player/common/gtk/hxutil.cpp
player/common/gtk/pub/hxutil.h
Index: hxplayer.cpp
===================================================================
RCS file: /cvsroot/player/common/gtk/hxplayer.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- hxplayer.cpp 26 Dec 2007 10:09:58 -0000 1.62
+++ hxplayer.cpp 20 Feb 2008 09:03:15 -0000 1.63
@@ -80,8 +80,8 @@
#include "hx-i18n.h"
#include "hxstatisticsobserver.h"
-
#include "chxplaybackvelocityresponse.h"
+#include "hxutil.h"
extern "C"
{
@@ -1162,20 +1162,8 @@
}
// Default to executable path if HELIX_LIBS environment variable is not set.
- gchar *exec_sym_link = g_strdup_printf("/proc/%i/exe", getpid());
const gchar *helix_libs = g_getenv("HELIX_LIBS");
- gchar *assumed_helix_libs = NULL;
-
- if ( g_file_test(exec_sym_link, G_FILE_TEST_IS_SYMLINK) )
- {
- // Read executable path.
- gchar *t = g_file_read_link(exec_sym_link, NULL);
- if (t)
- {
- assumed_helix_libs = g_path_get_dirname(t);
- g_free(t);
- }
- }
+ gchar *assumed_helix_libs = hx_util_get_executable_dir();
if (!helix_libs)
{
@@ -1192,7 +1180,6 @@
g_setenv("HELIX_LIBS", assumed_helix_libs, FALSE); // No overwrite.
HX_G_FREE(assumed_helix_libs);
}
- HX_G_FREE(exec_sym_link);
/* Initialize the engine */
if(!ClientPlayerCreate(&player->helix_client_token,
Index: hxutil.cpp
===================================================================
RCS file: /cvsroot/player/common/gtk/hxutil.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- hxutil.cpp 6 Jul 2007 20:49:23 -0000 1.12
+++ hxutil.cpp 20 Feb 2008 09:03:15 -0000 1.13
@@ -64,6 +64,8 @@
#include // for mkdir()
#include // for mkdir()
+#include "hxgerror.h"
+
typedef enum
{
@@ -730,4 +732,39 @@
return success;
}
+// Return a string representing path to the currently executable.
+// Call g_free() when done to free the return value.
+gchar*
+hx_util_get_executable_path()
+{
+ gchar *exec_path = NULL;
+ gchar *exec_sym_link = g_strdup_printf("/proc/%i/exe", getpid());
+
+ if ( g_file_test(exec_sym_link, G_FILE_TEST_IS_SYMLINK) )
+ {
+ // Read executable path.
+ exec_path = g_file_read_link(exec_sym_link, NULL);
+ }
+ HX_G_FREE(exec_sym_link);
+
+ return exec_path;
+}
+
+// Return a string representing directory path to the currently executable.
+// Call g_free() when done to free the return value.
+gchar*
+hx_util_get_executable_dir()
+{
+ gchar *exec_dir = NULL;
+
+ // Read executable path.
+ gchar *t = hx_util_get_executable_path();
+ if (t)
+ {
+ exec_dir = g_path_get_dirname(t);
+ HX_G_FREE(t);
+ }
+
+ return exec_dir;
+}
From dyek at helixcommunity.org Wed Feb 20 01:03:19 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 00:13:16 2008
Subject: [Player-cvs] common/gtk/pub hxutil.h,1.9,1.10
Message-ID:
Update of /cvsroot/player/common/gtk/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv5222/pub
Modified Files:
hxutil.h
Log Message:
Merge from 205Cay.
Refactor executable path code into hxutil.cpp.
Created:
hx_util_get_executable_path();
hx_util_get_executable_dir();
The first function returns the executable-binary path.
The second function returns the installation directory path.
Files Modified:
player/common/gtk/hxplayer.cpp
player/common/gtk/hxutil.cpp
player/common/gtk/pub/hxutil.h
Index: hxutil.h
===================================================================
RCS file: /cvsroot/player/common/gtk/pub/hxutil.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- hxutil.h 6 Jul 2007 20:50:00 -0000 1.9
+++ hxutil.h 20 Feb 2008 09:03:16 -0000 1.10
@@ -119,6 +119,8 @@
gboolean hx_mkdir_with_parents(gchar *dir, int mode);
+gchar* hx_util_get_executable_path();
+gchar* hx_util_get_executable_dir();
G_END_DECLS
From zhuao at helixcommunity.org Wed Feb 20 05:15:51 2008
From: zhuao at helixcommunity.org (zhuao@helixcommunity.org)
Date: Wed Feb 20 04:25:43 2008
Subject: [Player-cvs] kit/dbus-server dist,1.3,1.4
Message-ID:
Update of /cvsroot/player/kit/dbus-server
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv23098
Modified Files:
dist
Log Message:
Synopsis:
1> add hxplayer_pump to g_main_loop by g_timeout_add_full().
then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Overview:
1> helix engine is not thread safe, create a new thread to do pump
for helix engine doesn't work on Atlas310 branch.
we have added a work around before:
media service provides an API named Pump()
media application periodically call Pump()
Now we find a better solution that add hxplayer_pump to g_main_loop
by g_timeout_add_full(). then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Files Added:
No file added
Files Modified:
hxplayer.h: (player/kit/dbus-server/pub/hxplayer.h)
add function declaration: hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop()
modify function declaration: hxplayer_pump();
hxmessage.h: (player/kit/dbus-server/pub/hxmessage.h)
add signal type for UpdatePos: HX_MESSAGE_UPDATE_POSITION
helix-dbus-server.cpp: (player/kit/dbus-server/src/helix-dbus-server.cpp)
add D-Bus API: StopPump()
Add Pump() to g_main_loop() when Play
Remove Pump() from g_main_loop() when Pause/Stop
hxplayer.cpp: (player/kit/dbus-server/src/hxplayer.cpp)
UpdatePos implementation
hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop().
Image Size and Heap Use impact (Client -Only):
little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
dbus-server-pump.diff
Index: dist
===================================================================
RCS file: /cvsroot/player/kit/dbus-server/dist,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dist 25 Dec 2007 03:09:29 -0000 1.3
+++ dist 20 Feb 2008 13:15:48 -0000 1.4
@@ -107,6 +107,10 @@
}
function make_install () {
+ ## for binary installation package, helix-dbus-server.bin is in ./bin diretory
+ if [ -d bin ]; then
+ LOCAL_BINDIR=bin
+ fi
bindir=${DESTDIR}${PREFIX}/bin
libdir=${DESTDIR}${PREFIX}/lib
pkglibdir=$libdir/helix-dbus-server
@@ -129,8 +133,7 @@
install -d $dbusdir || exit 1
echo "Installing helix-dbus-server.bin into $pkglibdir"
- ## install -m 0755 $LOCAL_BINDIR/helix-dbus-server.bin $pkglibdir || exit 1
- install -m 0755 bin/helix-dbus-server.bin $pkglibdir || exit 1
+ install -m 0755 $LOCAL_BINDIR/helix-dbus-server.bin $pkglibdir || exit 1
echo "Installing helix-dbus-server into $bindir"
install -m 0755 data/helix-dbus-server $bindir
From zhuao at helixcommunity.org Wed Feb 20 05:15:52 2008
From: zhuao at helixcommunity.org (zhuao@helixcommunity.org)
Date: Wed Feb 20 04:25:44 2008
Subject: [Player-cvs] kit/dbus-server/pub hxmessage.h, 1.1, 1.2 hxplayer.h,
1.10, 1.11
Message-ID:
Update of /cvsroot/player/kit/dbus-server/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv23098/pub
Modified Files:
hxmessage.h hxplayer.h
Log Message:
Synopsis:
1> add hxplayer_pump to g_main_loop by g_timeout_add_full().
then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Overview:
1> helix engine is not thread safe, create a new thread to do pump
for helix engine doesn't work on Atlas310 branch.
we have added a work around before:
media service provides an API named Pump()
media application periodically call Pump()
Now we find a better solution that add hxplayer_pump to g_main_loop
by g_timeout_add_full(). then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Files Added:
No file added
Files Modified:
hxplayer.h: (player/kit/dbus-server/pub/hxplayer.h)
add function declaration: hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop()
modify function declaration: hxplayer_pump();
hxmessage.h: (player/kit/dbus-server/pub/hxmessage.h)
add signal type for UpdatePos: HX_MESSAGE_UPDATE_POSITION
helix-dbus-server.cpp: (player/kit/dbus-server/src/helix-dbus-server.cpp)
add D-Bus API: StopPump()
Add Pump() to g_main_loop() when Play
Remove Pump() from g_main_loop() when Pause/Stop
hxplayer.cpp: (player/kit/dbus-server/src/hxplayer.cpp)
UpdatePos implementation
hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop().
Image Size and Heap Use impact (Client -Only):
little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
dbus-server-pump.diff
Index: hxmessage.h
===================================================================
RCS file: /cvsroot/player/kit/dbus-server/pub/hxmessage.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hxmessage.h 21 Sep 2007 02:01:01 -0000 1.1
+++ hxmessage.h 20 Feb 2008 13:15:49 -0000 1.2
@@ -56,7 +56,8 @@
HX_MESSAGE_GOTO_URL,
HX_MESSAGE_REQUEST_AUTHENTICATION,
HX_MESSAGE_REQUEST_UPGRADE,
- HX_MESSAGE_HAS_COMPONENT
+ HX_MESSAGE_HAS_COMPONENT,
+ HX_MESSAGE_UPDATE_POSITION
} HxMessageType;
HxMessage *hxmessage_new(HxMessageType type);
Index: hxplayer.h
===================================================================
RCS file: /cvsroot/player/kit/dbus-server/pub/hxplayer.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hxplayer.h 25 Dec 2007 01:10:56 -0000 1.10
+++ hxplayer.h 20 Feb 2008 13:15:49 -0000 1.11
@@ -55,7 +55,7 @@
guint hxplayer_get_content_state(HxPlayer *hxplayer);
HXClientPlayerToken hxplayer_get_player_token(HxPlayer *hxplayer);
-void hxplayer_pump(HxPlayer *hxplayer);
+bool hxplayer_pump(HxPlayer *hxplayer);
void hxplayer_pump_begin(HxPlayer *hxplayer);
void hxplayer_pump_end(HxPlayer *hxplayer);
gboolean hxplayer_resize_window( HxPlayer* hxplayer, int* p_width, int* p_height, int* p_pos_x, int* p_pos_y, int video_size_mode);
@@ -64,4 +64,7 @@
TnPlayer *tnplayer_new();
bool tnplayer_get_thumbnail(TnPlayer* tnplayer, gchar* uri, gchar* file);
void tnplayer_free(TnPlayer* tnplayer);
+bool hxplayer_pump_start_gloop(HxPlayer *hxplayer);
+bool hxplayer_pump_stop_gloop(HxPlayer *hxplayer);
+
#endif /* _HXPLAYER_H */
From zhuao at helixcommunity.org Wed Feb 20 05:15:53 2008
From: zhuao at helixcommunity.org (zhuao@helixcommunity.org)
Date: Wed Feb 20 04:25:45 2008
Subject: [Player-cvs] kit/dbus-server/src helix-dbus-server.cpp, 1.17,
1.18 hxplayer.cpp, 1.15, 1.16
Message-ID:
Update of /cvsroot/player/kit/dbus-server/src
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv23098/src
Modified Files:
helix-dbus-server.cpp hxplayer.cpp
Log Message:
Synopsis:
1> add hxplayer_pump to g_main_loop by g_timeout_add_full().
then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Overview:
1> helix engine is not thread safe, create a new thread to do pump
for helix engine doesn't work on Atlas310 branch.
we have added a work around before:
media service provides an API named Pump()
media application periodically call Pump()
Now we find a better solution that add hxplayer_pump to g_main_loop
by g_timeout_add_full(). then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Files Added:
No file added
Files Modified:
hxplayer.h: (player/kit/dbus-server/pub/hxplayer.h)
add function declaration: hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop()
modify function declaration: hxplayer_pump();
hxmessage.h: (player/kit/dbus-server/pub/hxmessage.h)
add signal type for UpdatePos: HX_MESSAGE_UPDATE_POSITION
helix-dbus-server.cpp: (player/kit/dbus-server/src/helix-dbus-server.cpp)
add D-Bus API: StopPump()
Add Pump() to g_main_loop() when Play
Remove Pump() from g_main_loop() when Pause/Stop
hxplayer.cpp: (player/kit/dbus-server/src/hxplayer.cpp)
UpdatePos implementation
hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop().
Image Size and Heap Use impact (Client -Only):
little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
dbus-server-pump.diff
Index: helix-dbus-server.cpp
===================================================================
RCS file: /cvsroot/player/kit/dbus-server/src/helix-dbus-server.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- helix-dbus-server.cpp 25 Jan 2008 06:00:56 -0000 1.17
+++ helix-dbus-server.cpp 20 Feb 2008 13:15:50 -0000 1.18
@@ -109,6 +109,7 @@
METHOD_HANDLER_DEFINE(helix_dbus_server_handle_get_statistic_fps);
METHOD_HANDLER_DEFINE(helix_dbus_server_handle_get_statistic_by_key);
METHOD_HANDLER_DEFINE(helix_dbus_server_handle_get_fps);
+METHOD_HANDLER_DEFINE(helix_dbus_server_handle_stop_pump);
static HelixDbusMethodVTable method_handler_vtable [] = {
{ "Ping", DBUS_TYPE_INVALID, helix_dbus_server_handle_ping },
{ "OpenUri", DBUS_TYPE_BOOLEAN, helix_dbus_server_handle_open_uri },
@@ -140,6 +141,7 @@
{ "GetStatistic", DBUS_TYPE_STRING, helix_dbus_server_handle_get_statistic_fps},
{ "GetStatisticByKey", DBUS_TYPE_STRING, helix_dbus_server_handle_get_statistic_by_key},
{ "GetStatisticGetFPS", DBUS_TYPE_STRING, helix_dbus_server_handle_get_fps},
+ { "StopPump", DBUS_TYPE_BOOLEAN, helix_dbus_server_handle_stop_pump},
{ NULL, 0, NULL }
};
@@ -545,6 +547,7 @@
hxplayer_init(server->player, NULL);
}
ClientPlayerPlay(PLAYER_TOKEN(server->player));
+ hxplayer_pump_start_gloop(server->player);
}
static void
@@ -552,6 +555,7 @@
void **return_value)
{
ClientPlayerPause(PLAYER_TOKEN(server->player));
+ hxplayer_pump_stop_gloop(server->player);
}
static void
@@ -690,6 +694,7 @@
void **return_value)
{
ClientPlayerStop(PLAYER_TOKEN(server->player));
+ hxplayer_pump_stop_gloop(server->player);
}
static void
@@ -710,6 +715,8 @@
helix_dbus_server_handle_pump(HelixDbusServer *server, DBusMessage *message,
void **return_value)
{
+ // disable pump here, since we use g_timeout_add_full()
+ return;
if(ClientPlayerIsLive(PLAYER_TOKEN(server->player)))
{
return;
@@ -923,7 +930,8 @@
dbus_connection_unref(server->connection);
server->connection = NULL;
}
-
+
+ hxplayer_pump_stop_gloop(server->player);
if(server->player != NULL)
{
@@ -1059,3 +1067,8 @@
fps_value = guess_fps(server->player);
*return_value = fps_value;
}
+void helix_dbus_server_handle_stop_pump(HelixDbusServer *server,DBusMessage *message,
+void **return_value)
+{
+ *return_value = (gpointer)hxplayer_pump_stop_gloop(server->player);
+}
Index: hxplayer.cpp
===================================================================
RCS file: /cvsroot/player/kit/dbus-server/src/hxplayer.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- hxplayer.cpp 31 Jan 2008 06:13:40 -0000 1.15
+++ hxplayer.cpp 20 Feb 2008 13:15:50 -0000 1.16
@@ -72,6 +72,8 @@
XID clntXID;
bool bInitialized;
int content_state;
+ guint pumpSourceID;
+ bool bPump;
};
struct TnPlayer {
HxPlayer *thumb_nail_service;
@@ -330,6 +332,22 @@
NULL
};
+static void
+UpdatePos(HxPlayer *hxplayer)
+{
+ UInt32 pos = 0;
+ static int counter = 0;
+ counter++;
+ if(!(counter %10) || !(hxplayer->bPump))
+ {
+ pos = ClientPlayerGetPosition(hxplayer->token);
+
+ HxMessageSegment * msgSeg_position = hxmessage_segment_new_int32(NULL, pos);
+ HxMessage * message = hxmessage_new_args(HX_MESSAGE_UPDATE_POSITION,msgSeg_position, NULL);
+ hxplayer_raise_signal(hxplayer, message,"UpdatePos");
+ }
+}
+
// Fake Preferences Methods; Required to work around a bug that
// causes segfaults in httpfsys
@@ -720,6 +738,7 @@
hxplayer_pump_end(hxplayer);
#endif
+ hxplayer_pump_stop_gloop(hxplayer);
ClientPlayerClose(hxplayer->token);
g_free(hxplayer->window);
@@ -816,22 +835,22 @@
}
return StateMap(hxplayer->content_state);
}
-void
+bool
hxplayer_pump(HxPlayer *hxplayer)
{
if(hxplayer == NULL)
{
- return;
+ return false;
}
if(!(hxplayer->bInitialized))
{
- return;
+ return true;
}
static int sem_flag = 0;
if (sem_flag)
{
- return;
+ return true;
}
sem_flag = 1;
@@ -884,6 +903,8 @@
}
#endif
sem_flag = 0;
+ UpdatePos(hxplayer);
+ return hxplayer->bPump;
}
void
@@ -913,6 +934,7 @@
void
hxplayer_pump_begin(HxPlayer *hxplayer)
{
+ return;
if(hxplayer == NULL || hxplayer->tid != 0)
{
return;
@@ -925,6 +947,7 @@
void
hxplayer_pump_end(HxPlayer *hxplayer)
{
+ return;
if(hxplayer == NULL || hxplayer->tid == 0 || hxplayer->join_request == TRUE)
{
return;
@@ -1303,3 +1326,27 @@
hxplayer_free(tnplayer->thumb_nail_service);
}
}
+
+bool
+hxplayer_pump_start_gloop(HxPlayer *hxplayer)
+{
+ if(NULL == hxplayer)
+ return false;
+ if(hxplayer->bPump)
+ return true;
+
+ hxplayer->pumpSourceID = g_timeout_add_full(G_PRIORITY_DEFAULT,50,hxplayer_pump,hxplayer,hxplayer_pump_stop_gloop);
+ if (hxplayer->pumpSourceID)
+ {
+ hxplayer->bPump = true;
+ return true;
+ }
+ return false;
+
+}
+bool hxplayer_pump_stop_gloop(HxPlayer *hxplayer)
+{
+ g_source_remove(hxplayer->pumpSourceID);
+ hxplayer->bPump = false;
+ return true;
+}
From zhuao at helixcommunity.org Wed Feb 20 05:26:36 2008
From: zhuao at helixcommunity.org (zhuao@helixcommunity.org)
Date: Wed Feb 20 04:36:48 2008
Subject: [Player-cvs] kit/dbus-server dist,1.1.2.4,1.1.2.5
Message-ID:
Update of /cvsroot/player/kit/dbus-server
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv2677/dbus-server
Modified Files:
Tag: hxclient_3_1_0_atlas
dist
Log Message:
Synopsis:
1> add hxplayer_pump to g_main_loop by g_timeout_add_full().
then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Overview:
1> helix engine is not thread safe, create a new thread to do pump
for helix engine doesn't work on Atlas310 branch.
we have added a work around before:
media service provides an API named Pump()
media application periodically call Pump()
Now we find a better solution that add hxplayer_pump to g_main_loop
by g_timeout_add_full(). then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Files Added:
No file added
Files Modified:
hxplayer.h: (player/kit/dbus-server/pub/hxplayer.h)
add function declaration: hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop()
modify function declaration: hxplayer_pump();
hxmessage.h: (player/kit/dbus-server/pub/hxmessage.h)
add signal type for UpdatePos: HX_MESSAGE_UPDATE_POSITION
helix-dbus-server.cpp: (player/kit/dbus-server/src/helix-dbus-server.cpp)
add D-Bus API: StopPump()
Add Pump() to g_main_loop() when Play
Remove Pump() from g_main_loop() when Pause/Stop
hxplayer.cpp: (player/kit/dbus-server/src/hxplayer.cpp)
UpdatePos implementation
hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop().
Image Size and Heap Use impact (Client -Only):
little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
dbus-server-pump.diff
Index: dist
===================================================================
RCS file: /cvsroot/player/kit/dbus-server/dist,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- dist 25 Dec 2007 02:57:10 -0000 1.1.2.4
+++ dist 20 Feb 2008 13:26:32 -0000 1.1.2.5
@@ -107,6 +107,10 @@
}
function make_install () {
+ ## for binary installation package, helix-dbus-server.bin is in ./bin diretory
+ if [ -d bin ]; then
+ LOCAL_BINDIR=bin
+ fi
bindir=${DESTDIR}${PREFIX}/bin
libdir=${DESTDIR}${PREFIX}/lib
pkglibdir=$libdir/helix-dbus-server
@@ -129,8 +133,7 @@
install -d $dbusdir || exit 1
echo "Installing helix-dbus-server.bin into $pkglibdir"
- ## install -m 0755 $LOCAL_BINDIR/helix-dbus-server.bin $pkglibdir || exit 1
- install -m 0755 bin/helix-dbus-server.bin $pkglibdir || exit 1
+ install -m 0755 $LOCAL_BINDIR/helix-dbus-server.bin $pkglibdir || exit 1
echo "Installing helix-dbus-server into $bindir"
install -m 0755 data/helix-dbus-server $bindir
From zhuao at helixcommunity.org Wed Feb 20 05:26:37 2008
From: zhuao at helixcommunity.org (zhuao@helixcommunity.org)
Date: Wed Feb 20 04:36:49 2008
Subject: [Player-cvs] kit/dbus-server/pub hxmessage.h, 1.1.2.2,
1.1.2.3 hxplayer.h, 1.2.2.10, 1.2.2.11
Message-ID:
Update of /cvsroot/player/kit/dbus-server/pub
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv2677/dbus-server/pub
Modified Files:
Tag: hxclient_3_1_0_atlas
hxmessage.h hxplayer.h
Log Message:
Synopsis:
1> add hxplayer_pump to g_main_loop by g_timeout_add_full().
then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Overview:
1> helix engine is not thread safe, create a new thread to do pump
for helix engine doesn't work on Atlas310 branch.
we have added a work around before:
media service provides an API named Pump()
media application periodically call Pump()
Now we find a better solution that add hxplayer_pump to g_main_loop
by g_timeout_add_full(). then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Files Added:
No file added
Files Modified:
hxplayer.h: (player/kit/dbus-server/pub/hxplayer.h)
add function declaration: hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop()
modify function declaration: hxplayer_pump();
hxmessage.h: (player/kit/dbus-server/pub/hxmessage.h)
add signal type for UpdatePos: HX_MESSAGE_UPDATE_POSITION
helix-dbus-server.cpp: (player/kit/dbus-server/src/helix-dbus-server.cpp)
add D-Bus API: StopPump()
Add Pump() to g_main_loop() when Play
Remove Pump() from g_main_loop() when Pause/Stop
hxplayer.cpp: (player/kit/dbus-server/src/hxplayer.cpp)
UpdatePos implementation
hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop().
Image Size and Heap Use impact (Client -Only):
little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
dbus-server-pump.diff
Index: hxmessage.h
===================================================================
RCS file: /cvsroot/player/kit/dbus-server/pub/hxmessage.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- hxmessage.h 21 Sep 2007 08:48:48 -0000 1.1.2.2
+++ hxmessage.h 20 Feb 2008 13:26:33 -0000 1.1.2.3
@@ -56,7 +56,8 @@
HX_MESSAGE_GOTO_URL,
HX_MESSAGE_REQUEST_AUTHENTICATION,
HX_MESSAGE_REQUEST_UPGRADE,
- HX_MESSAGE_HAS_COMPONENT
+ HX_MESSAGE_HAS_COMPONENT,
+ HX_MESSAGE_UPDATE_POSITION
} HxMessageType;
HxMessage *hxmessage_new(HxMessageType type);
Index: hxplayer.h
===================================================================
RCS file: /cvsroot/player/kit/dbus-server/pub/hxplayer.h,v
retrieving revision 1.2.2.10
retrieving revision 1.2.2.11
diff -u -d -r1.2.2.10 -r1.2.2.11
--- hxplayer.h 25 Dec 2007 02:01:35 -0000 1.2.2.10
+++ hxplayer.h 20 Feb 2008 13:26:33 -0000 1.2.2.11
@@ -55,7 +55,7 @@
guint hxplayer_get_content_state(HxPlayer *hxplayer);
HXClientPlayerToken hxplayer_get_player_token(HxPlayer *hxplayer);
-void hxplayer_pump(HxPlayer *hxplayer);
+bool hxplayer_pump(HxPlayer *hxplayer);
void hxplayer_pump_begin(HxPlayer *hxplayer);
void hxplayer_pump_end(HxPlayer *hxplayer);
gboolean hxplayer_resize_window( HxPlayer* hxplayer, int* p_width, int* p_height, int* p_pos_x, int* p_pos_y, int video_size_mode);
@@ -64,4 +64,7 @@
TnPlayer *tnplayer_new();
bool tnplayer_get_thumbnail(TnPlayer* tnplayer, gchar* uri, gchar* file);
void tnplayer_free(TnPlayer* tnplayer);
+bool hxplayer_pump_start_gloop(HxPlayer *hxplayer);
+bool hxplayer_pump_stop_gloop(HxPlayer *hxplayer);
+
#endif /* _HXPLAYER_H */
From zhuao at helixcommunity.org Wed Feb 20 05:26:39 2008
From: zhuao at helixcommunity.org (zhuao@helixcommunity.org)
Date: Wed Feb 20 04:36:49 2008
Subject: [Player-cvs] kit/dbus-server/src helix-dbus-server.cpp, 1.2.2.17,
1.2.2.18 hxplayer.cpp, 1.2.2.15, 1.2.2.16
Message-ID:
Update of /cvsroot/player/kit/dbus-server/src
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv2677/dbus-server/src
Modified Files:
Tag: hxclient_3_1_0_atlas
helix-dbus-server.cpp hxplayer.cpp
Log Message:
Synopsis:
1> add hxplayer_pump to g_main_loop by g_timeout_add_full().
then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Overview:
1> helix engine is not thread safe, create a new thread to do pump
for helix engine doesn't work on Atlas310 branch.
we have added a work around before:
media service provides an API named Pump()
media application periodically call Pump()
Now we find a better solution that add hxplayer_pump to g_main_loop
by g_timeout_add_full(). then pump can be done inside media engine itself.
2> we also add UpdatePos to g_main_loop, then media application
can update progress bar by this signal.
Files Added:
No file added
Files Modified:
hxplayer.h: (player/kit/dbus-server/pub/hxplayer.h)
add function declaration: hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop()
modify function declaration: hxplayer_pump();
hxmessage.h: (player/kit/dbus-server/pub/hxmessage.h)
add signal type for UpdatePos: HX_MESSAGE_UPDATE_POSITION
helix-dbus-server.cpp: (player/kit/dbus-server/src/helix-dbus-server.cpp)
add D-Bus API: StopPump()
Add Pump() to g_main_loop() when Play
Remove Pump() from g_main_loop() when Pause/Stop
hxplayer.cpp: (player/kit/dbus-server/src/hxplayer.cpp)
UpdatePos implementation
hxplayer_pump_start_gloop(), hxplayer_pump_stop_gloop().
Image Size and Heap Use impact (Client -Only):
little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
dbus-server-pump.diff
Index: helix-dbus-server.cpp
===================================================================
RCS file: /cvsroot/player/kit/dbus-server/src/helix-dbus-server.cpp,v
retrieving revision 1.2.2.17
retrieving revision 1.2.2.18
diff -u -d -r1.2.2.17 -r1.2.2.18
--- helix-dbus-server.cpp 25 Jan 2008 05:36:13 -0000 1.2.2.17
+++ helix-dbus-server.cpp 20 Feb 2008 13:26:35 -0000 1.2.2.18
@@ -109,6 +109,7 @@
METHOD_HANDLER_DEFINE(helix_dbus_server_handle_get_statistic_fps);
METHOD_HANDLER_DEFINE(helix_dbus_server_handle_get_statistic_by_key);
METHOD_HANDLER_DEFINE(helix_dbus_server_handle_get_fps);
+METHOD_HANDLER_DEFINE(helix_dbus_server_handle_stop_pump);
static HelixDbusMethodVTable method_handler_vtable [] = {
{ "Ping", DBUS_TYPE_INVALID, helix_dbus_server_handle_ping },
{ "OpenUri", DBUS_TYPE_BOOLEAN, helix_dbus_server_handle_open_uri },
@@ -140,6 +141,7 @@
{ "GetStatistic", DBUS_TYPE_STRING, helix_dbus_server_handle_get_statistic_fps},
{ "GetStatisticByKey", DBUS_TYPE_STRING, helix_dbus_server_handle_get_statistic_by_key},
{ "GetStatisticGetFPS", DBUS_TYPE_STRING, helix_dbus_server_handle_get_fps},
+ { "StopPump", DBUS_TYPE_BOOLEAN, helix_dbus_server_handle_stop_pump},
{ NULL, 0, NULL }
};
@@ -545,6 +547,7 @@
hxplayer_init(server->player, NULL);
}
ClientPlayerPlay(PLAYER_TOKEN(server->player));
+ hxplayer_pump_start_gloop(server->player);
}
static void
@@ -552,6 +555,7 @@
void **return_value)
{
ClientPlayerPause(PLAYER_TOKEN(server->player));
+ hxplayer_pump_stop_gloop(server->player);
}
static void
@@ -690,6 +694,7 @@
void **return_value)
{
ClientPlayerStop(PLAYER_TOKEN(server->player));
+ hxplayer_pump_stop_gloop(server->player);
}
static void
@@ -710,6 +715,8 @@
helix_dbus_server_handle_pump(HelixDbusServer *server, DBusMessage *message,
void **return_value)
{
+ // disable pump here, since we use g_timeout_add_full()
+ return;
if(ClientPlayerIsLive(PLAYER_TOKEN(server->player)))
{
return;
@@ -923,7 +930,8 @@
dbus_connection_unref(server->connection);
server->connection = NULL;
}
-
+
+ hxplayer_pump_stop_gloop(server->player);
if(server->player != NULL)
{
@@ -1059,3 +1067,8 @@
fps_value = guess_fps(server->player);
*return_value = fps_value;
}
+void helix_dbus_server_handle_stop_pump(HelixDbusServer *server,DBusMessage *message,
+void **return_value)
+{
+ *return_value = (gpointer)hxplayer_pump_stop_gloop(server->player);
+}
Index: hxplayer.cpp
===================================================================
RCS file: /cvsroot/player/kit/dbus-server/src/hxplayer.cpp,v
retrieving revision 1.2.2.15
retrieving revision 1.2.2.16
diff -u -d -r1.2.2.15 -r1.2.2.16
--- hxplayer.cpp 31 Jan 2008 06:01:06 -0000 1.2.2.15
+++ hxplayer.cpp 20 Feb 2008 13:26:35 -0000 1.2.2.16
@@ -72,6 +72,8 @@
XID clntXID;
bool bInitialized;
int content_state;
+ guint pumpSourceID;
+ bool bPump;
};
struct TnPlayer {
HxPlayer *thumb_nail_service;
@@ -330,6 +332,22 @@
NULL
};
+static void
+UpdatePos(HxPlayer *hxplayer)
+{
+ UInt32 pos = 0;
+ static int counter = 0;
+ counter++;
+ if(!(counter %10) || !(hxplayer->bPump))
+ {
+ pos = ClientPlayerGetPosition(hxplayer->token);
+
+ HxMessageSegment * msgSeg_position = hxmessage_segment_new_int32(NULL, pos);
+ HxMessage * message = hxmessage_new_args(HX_MESSAGE_UPDATE_POSITION,msgSeg_position, NULL);
+ hxplayer_raise_signal(hxplayer, message,"UpdatePos");
+ }
+}
+
// Fake Preferences Methods; Required to work around a bug that
// causes segfaults in httpfsys
@@ -720,6 +738,7 @@
hxplayer_pump_end(hxplayer);
#endif
+ hxplayer_pump_stop_gloop(hxplayer);
ClientPlayerClose(hxplayer->token);
g_free(hxplayer->window);
@@ -816,22 +835,22 @@
}
return StateMap(hxplayer->content_state);
}
-void
+bool
hxplayer_pump(HxPlayer *hxplayer)
{
if(hxplayer == NULL)
{
- return;
+ return false;
}
if(!(hxplayer->bInitialized))
{
- return;
+ return true;
}
static int sem_flag = 0;
if (sem_flag)
{
- return;
+ return true;
}
sem_flag = 1;
@@ -884,6 +903,8 @@
}
#endif
sem_flag = 0;
+ UpdatePos(hxplayer);
+ return hxplayer->bPump;
}
void
@@ -913,6 +934,7 @@
void
hxplayer_pump_begin(HxPlayer *hxplayer)
{
+ return;
if(hxplayer == NULL || hxplayer->tid != 0)
{
return;
@@ -925,6 +947,7 @@
void
hxplayer_pump_end(HxPlayer *hxplayer)
{
+ return;
if(hxplayer == NULL || hxplayer->tid == 0 || hxplayer->join_request == TRUE)
{
return;
@@ -1303,3 +1326,27 @@
hxplayer_free(tnplayer->thumb_nail_service);
}
}
+
+bool
+hxplayer_pump_start_gloop(HxPlayer *hxplayer)
+{
+ if(NULL == hxplayer)
+ return false;
+ if(hxplayer->bPump)
+ return true;
+
+ hxplayer->pumpSourceID = g_timeout_add_full(G_PRIORITY_DEFAULT,50,hxplayer_pump,hxplayer,hxplayer_pump_stop_gloop);
+ if (hxplayer->pumpSourceID)
+ {
+ hxplayer->bPump = true;
+ return true;
+ }
+ return false;
+
+}
+bool hxplayer_pump_stop_gloop(HxPlayer *hxplayer)
+{
+ g_source_remove(hxplayer->pumpSourceID);
+ hxplayer->bPump = false;
+ return true;
+}
From zhuao at helixcommunity.org Wed Feb 20 05:31:56 2008
From: zhuao at helixcommunity.org (zhuao@helixcommunity.org)
Date: Wed Feb 20 04:41:51 2008
Subject: [Player-cvs] hxclientkit/src/platform/unix CHXClientEngineUnix.cpp,
1.21, 1.22
Message-ID:
Update of /cvsroot/player/hxclientkit/src/platform/unix
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8229/src/platform/unix
Modified Files:
CHXClientEngineUnix.cpp
Log Message:
Synopsis:
HX_ENABLE_LOGGING() was added to CHXClientEngine::CreateEngine recently.
but there is no HX_DISABLE_LOGGING() called in hxclientkit module, it is a bug.
I add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to fix it.
Overview:
HX_ENABLE_LOGGING() was added to CHXClientEngine::CreateEngine recently.
but there is no HX_DISABLE_LOGGING() called in hxclientkit module, it is a bug.
I add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to fix it.
Files Added:
No file added
Files Modified:
CHXClientEngineUnix.cpp: (src/platform/unix/CHXClientEngineUnix.cpp)
add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to close log system.
Image Size and Heap Use impact (Client -Only):
little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
hxclientkit-logutil.diff
Index: CHXClientEngineUnix.cpp
===================================================================
RCS file: /cvsroot/player/hxclientkit/src/platform/unix/CHXClientEngineUnix.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- CHXClientEngineUnix.cpp 17 Oct 2007 02:34:17 -0000 1.21
+++ CHXClientEngineUnix.cpp 20 Feb 2008 13:31:51 -0000 1.22
@@ -55,6 +55,7 @@
#include "dllpath.h"
#include "hxwintyp.h"
#include
+#include "hxtlogutil.h"
// XXXNH: is there a better place to put this?
#define MAX_PATH 256
@@ -349,6 +350,7 @@
void
CHXClientEngineUnix::OnCloseClientEngine(void)
{
+ HX_DISABLE_LOGGING(true); // true means the engine is shutdowning.
if (m_pICoreEngine)
{
HX_ASSERT(m_dllHXCore.isOpen());
From zhuao at helixcommunity.org Wed Feb 20 05:38:33 2008
From: zhuao at helixcommunity.org (zhuao@helixcommunity.org)
Date: Wed Feb 20 04:49:40 2008
Subject: [Player-cvs] hxclientkit/src/platform/unix CHXClientEngineUnix.cpp,
1.20.2.1, 1.20.2.2
Message-ID:
Update of /cvsroot/player/hxclientkit/src/platform/unix
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv15720/src/platform/unix
Modified Files:
Tag: hxclient_3_1_0_atlas
CHXClientEngineUnix.cpp
Log Message:
Synopsis:
HX_ENABLE_LOGGING() was added to CHXClientEngine::CreateEngine recently.
but there is no HX_DISABLE_LOGGING() called in hxclientkit module, it is a bug.
I add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to fix it.
Overview:
HX_ENABLE_LOGGING() was added to CHXClientEngine::CreateEngine recently.
but there is no HX_DISABLE_LOGGING() called in hxclientkit module, it is a bug.
I add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to fix it.
Files Added:
No file added
Files Modified:
CHXClientEngineUnix.cpp: (src/platform/unix/CHXClientEngineUnix.cpp)
add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to close log system.
Image Size and Heap Use impact (Client -Only):
little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
hxclientkit-logutil.diff
Index: CHXClientEngineUnix.cpp
===================================================================
RCS file: /cvsroot/player/hxclientkit/src/platform/unix/CHXClientEngineUnix.cpp,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -d -r1.20.2.1 -r1.20.2.2
--- CHXClientEngineUnix.cpp 17 Oct 2007 02:33:34 -0000 1.20.2.1
+++ CHXClientEngineUnix.cpp 20 Feb 2008 13:38:30 -0000 1.20.2.2
@@ -55,6 +55,7 @@
#include "dllpath.h"
#include "hxwintyp.h"
#include
+#include "hxtlogutil.h"
// XXXNH: is there a better place to put this?
#define MAX_PATH 256
@@ -349,6 +350,7 @@
void
CHXClientEngineUnix::OnCloseClientEngine(void)
{
+ HX_DISABLE_LOGGING(true); // true means the engine is shutdowning.
if (m_pICoreEngine)
{
HX_ASSERT(m_dllHXCore.isOpen());
From dyek at helixcommunity.org Wed Feb 20 13:51:36 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 13:01:22 2008
Subject: [Player-cvs] installer/archive make_tempdir,1.84,1.84.2.1
Message-ID:
Update of /cvsroot/player/installer/archive
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv20237/player/installer/archive
Modified Files:
Tag: hxclient_2_0_5_cayenne
make_tempdir
Log Message:
Enable post-build editing of distribution channel distcode suffix.
Create a distcode (suffix) file to be appended to distcode.
The file can be edited after build and then repackaged.
All Linux packages now use "LN".
All SunOS packages now use "SL".
Files Added:
player/installer/common/postinst/install_misc.sh - chmod a-x distcode
Files Modified:
player/app/gtk/Umakefil - Create distcode suffix file.
player/app/gtk/mainapp.cpp
player/app/gtk/mainapp-private.h
player/installer/archive/make_tempdir - Copy distcode file.
player/installer/common/postinst/postinst.sh
Refer to the following URL for more information:
http://lists.helixcommunity.org/pipermail/player-dev/2008-February/003318.html
Index: make_tempdir
===================================================================
RCS file: /cvsroot/player/installer/archive/make_tempdir,v
retrieving revision 1.84
retrieving revision 1.84.2.1
diff -u -d -r1.84 -r1.84.2.1
--- make_tempdir 30 Jan 2008 23:13:28 -0000 1.84
+++ make_tempdir 20 Feb 2008 21:51:34 -0000 1.84.2.1
@@ -411,6 +411,10 @@
inst.CopyModuleDll("common/log/logobserverfile", "logobserverfile", "plugins/logobserverfile")
+# Copy distcode file
+inst.CopyFiles(
+ ("../../../player/app/gtk/distcode", "share/distcode"))
+
# mo files (gettext)
inst.MakeDirs("share/locale")
From dyek at helixcommunity.org Wed Feb 20 13:51:37 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 13:01:23 2008
Subject: [Player-cvs] installer/common/postinst install_misc.sh, NONE,
1.1.2.1 postinst.sh, 1.6, 1.6.2.1
Message-ID:
Update of /cvsroot/player/installer/common/postinst
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv20237/player/installer/common/postinst
Modified Files:
Tag: hxclient_2_0_5_cayenne
postinst.sh
Added Files:
Tag: hxclient_2_0_5_cayenne
install_misc.sh
Log Message:
Enable post-build editing of distribution channel distcode suffix.
Create a distcode (suffix) file to be appended to distcode.
The file can be edited after build and then repackaged.
All Linux packages now use "LN".
All SunOS packages now use "SL".
Files Added:
player/installer/common/postinst/install_misc.sh - chmod a-x distcode
Files Modified:
player/app/gtk/Umakefil - Create distcode suffix file.
player/app/gtk/mainapp.cpp
player/app/gtk/mainapp-private.h
player/installer/archive/make_tempdir - Copy distcode file.
player/installer/common/postinst/postinst.sh
Refer to the following URL for more information:
http://lists.helixcommunity.org/pipermail/player-dev/2008-February/003318.html
--- NEW FILE: install_misc.sh ---
#!/bin/bash
export ARG0=$0
POSTINST_DIR=${ARG0%/*} # Delete trailing file name.
POSTINST_DIR=$( cd $POSTINST_DIR; pwd )
export POSTINST_DIR
pushd $POSTINST_DIR > /dev/null
. ./functions
DISTCODE_FILE=$INSTDIR/share/distcode
if [ -f $DISTCODE_FILE ]; then
chmod a-w $DISTCODE_FILE
fi
# platform-specific scripts
if [ `uname` = "SunOS" -a -x $INSTDIR/postinst/solarisinst.sh ] ; then
$INSTDIR/postinst/solarisinst.sh $INSTDIR $LOGFILE
fi
popd > /dev/null
Index: postinst.sh
===================================================================
RCS file: /cvsroot/player/installer/common/postinst/postinst.sh,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- postinst.sh 30 Jan 2008 23:13:26 -0000 1.6
+++ postinst.sh 20 Feb 2008 21:51:34 -0000 1.6.2.1
@@ -20,6 +20,7 @@
./install_fedora_selinux_workaround.sh
# Shouldn't be using system-wide symbolic link anymore.
./install_system_wide_sym_links_non_LSB.sh
+./install_misc.sh
# TODO: There is no /usr/lib/mozilla/defaults/pref/ directory;
# so this is most likely not needed anymore.
@@ -27,11 +28,5 @@
# ./install_moz_prefs.sh
-# platform-specific scripts
-if [ `uname` = "SunOS" -a -x $INSTDIR/postinst/solarisinst.sh ] ; then
- $INSTDIR/postinst/solarisinst.sh $INSTDIR $LOGFILE
-fi
-
-
popd > /dev/null
From dyek at helixcommunity.org Wed Feb 20 13:51:36 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 13:01:23 2008
Subject: [Player-cvs] app/gtk Umakefil, 1.106, 1.106.2.1 mainapp.cpp,
1.150.2.1, 1.150.2.2 mainapp-private.h, 1.8, 1.8.2.1
Message-ID:
Update of /cvsroot/player/app/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv20237/player/app/gtk
Modified Files:
Tag: hxclient_2_0_5_cayenne
Umakefil mainapp.cpp mainapp-private.h
Log Message:
Enable post-build editing of distribution channel distcode suffix.
Create a distcode (suffix) file to be appended to distcode.
The file can be edited after build and then repackaged.
All Linux packages now use "LN".
All SunOS packages now use "SL".
Files Added:
player/installer/common/postinst/install_misc.sh - chmod a-x distcode
Files Modified:
player/app/gtk/Umakefil - Create distcode suffix file.
player/app/gtk/mainapp.cpp
player/app/gtk/mainapp-private.h
player/installer/archive/make_tempdir - Copy distcode file.
player/installer/common/postinst/postinst.sh
Refer to the following URL for more information:
http://lists.helixcommunity.org/pipermail/player-dev/2008-February/003318.html
Index: mainapp-private.h
===================================================================
RCS file: /cvsroot/player/app/gtk/mainapp-private.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- mainapp-private.h 15 Nov 2007 05:32:21 -0000 1.8
+++ mainapp-private.h 20 Feb 2008 21:51:31 -0000 1.8.2.1
@@ -267,9 +267,9 @@
can save them properly when the window is destroyed */
gint x_pos, y_pos;
- /* Real.com declares that these are 7 char's max (+ '\0') */
- gchar distcode[8]; /* Code for player distribution method */
- gchar origcode[8]; /* The original distcode, before any updates/upgrades */
+ // 11 chars + null terminator; need to sync. with DISTCODE_SUFFIX_MAX_CHARS
+ gchar distcode[12]; /* Code for player distribution method */
+ gchar origcode[12]; /* The original distcode, before any updates/upgrades */
/* command line switchs */
gboolean quit_on_done;
Index: Umakefil
===================================================================
RCS file: /cvsroot/player/app/gtk/Umakefil,v
retrieving revision 1.106
retrieving revision 1.106.2.1
diff -u -d -r1.106 -r1.106.2.1
--- Umakefil 18 Jan 2008 23:03:19 -0000 1.106
+++ Umakefil 20 Feb 2008 21:51:31 -0000 1.106.2.1
@@ -49,6 +49,9 @@
# ***** END LICENSE BLOCK *****
#
+import re
+import os
+
UmakefileVersion(2,1)
# XXXNH: even though the version number might be >= 1.0/10.0 we haven't
@@ -80,30 +83,23 @@
project.AddDefines("PACKAGE=\"hxplay\"")
distcode = "HX%s1"
-if sysinfo.platform_qualifier == "redhat8":
- distcode = distcode + "D" # download
-elif sysinfo.platform_qualifier == "nld":
- distcode = distcode + "NL" # Novell Linux Desktop
-elif sysinfo.platform_qualifier == "rhel4":
- distcode = distcode + "RH" # RedHat
-elif sysinfo.platform_qualifier == "fedora3":
- distcode = distcode + "FC" # Fedora
-elif sysinfo.platform_qualifier == "jds3":
- distcode = distcode + "SJ" # Sun Java Desktop
-elif sysinfo.platform_qualifier == "turbo10":
- distcode = distcode + "TL" # Turbo Linux
-elif sysinfo.platform_qualifier == "debian3":
- distcode = distcode + "DG" # Debian/GNU
-elif sysinfo.platform_qualifier == "xandros3":
- distcode = distcode + "XA" # Xandros 3.0
-elif sysinfo.platform_qualifier == "linspire45":
- distcode = distcode + "LI" # Linspire 4.5
-elif sysinfo.platform_qualifier == "linspire5":
- distcode = distcode + "LI" # Linspire 5.0
+if re.search("^linux2", sysinfo.platform):
+ distcode = distcode + "LN" # Linux
+elif re.search("^sunos5", sysinfo.platform):
+ distcode = distcode + "SL" # Solaris
else:
distcode = distcode + "O" # Other
+
project.AddDefines('DISTCODE="' + distcode + '"')
+# Default (distribution channel) discode suffix.
+distcode_suffix = ""
+
+# Create the distcode (suffix) file.
+file = open("distcode", "w")
+file.write(distcode_suffix + "\n")
+file.close()
+
if project.IsDefined('HELIX_FEATURE_GNOME'):
pkg_modules = pkg_modules + " libgnome-2.0 libgnomeui-2.0"
project.AddDefines('USE_GNOME')
@@ -183,15 +179,6 @@
"cr1productidentity.cpp",
"cr1userauthentication.cpp")
-
- # libcurl & glibcurl
- curl_path = GetSDKPath("curl")
-
- project.AddLibraries(os.path.join(curl_path, "lib", "libcrypto.a"))
- project.AddLibraries(os.path.join(curl_path, "lib", "libssl.a"))
- project.AddLibraries(os.path.join(curl_path, "lib", "libcurl.a"))
- project.AddModuleLibraries("common/import/glibcurl[glibcurl]")
-
if not project.IsDefined('HELIX_FEATURE_LIBGLADE'):
project.AddSources("signin_interface.c")
Index: mainapp.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/mainapp.cpp,v
retrieving revision 1.150.2.1
retrieving revision 1.150.2.2
diff -u -d -r1.150.2.1 -r1.150.2.2
--- mainapp.cpp 19 Feb 2008 20:30:53 -0000 1.150.2.1
+++ mainapp.cpp 20 Feb 2008 21:51:31 -0000 1.150.2.2
@@ -65,6 +65,12 @@
*/
+#include
+#include
+#include
+#include
+
+
#include "HXClientCFuncs.h"
#include "mainapp.h"
@@ -161,6 +167,10 @@
// Support Help menu entries not supported by real.com switchboard.
#define HELP_MENU_SWITCHBOARD "https://player.helixcommunity.org/sitecode/redirect/?"
+#define DISTCODE_FILE "distcode"
+#define DISTCODE_SUFFIX_MAX_CHARS 3 // Not inclusive of null terminator; arbitrary.
+// The maximum number of chars of distcode is determined by sizeof(window->distcode),
+// not DISTCODE_SUFFIX_MAX_CHARS.
/* Data structures
* ===============
@@ -5127,11 +5137,55 @@
return;
}
+// Read distribution channel distcode suffix from file.
+static gint
+read_distcode_suffix(char *buffer, gssize buffer_size)
+{
+ char *instdir = NULL;
+ char *distcode_path = NULL;
+ int fd = 0;
+ ssize_t bytes_read = 0;
+
+ g_return_val_if_fail(buffer, FALSE);
+ g_return_val_if_fail(buffer_size > 0, FALSE);
+
+ buffer[0] = '\0';
+ instdir = hx_util_get_executable_dir();
+ distcode_path = g_build_filename(instdir, "share", DISTCODE_FILE, NULL); // instdir/share/distcode
+ HX_G_FREE(instdir);
+
+ fd = open(distcode_path, O_RDONLY);
+ HX_G_FREE(distcode_path);
+
+ if (fd < 0)
+ {
+ return 0;
+ }
+
+ bytes_read = read(fd, buffer, buffer_size - 1);
+
+ close(fd);
+ fd = 0;
+
+ if (bytes_read > 0)
+ {
+ buffer[bytes_read] = '\0';
+ g_strstrip(buffer);
+ printf("distcode suffix read = %s\n", buffer);
+ return strlen(buffer);
+ }
+ else
+ {
+ return 0;
+ }
+}
+
HXMainWindow*
hxwindow_new(void)
{
gchar* filename;
GdkPixmap* pixmap;
+ char distcode_suffix[DISTCODE_SUFFIX_MAX_CHARS + 1];
if(!g_hx_main_app)
{
@@ -5266,12 +5320,14 @@
{
distcode_lang = "";
}
+
+ read_distcode_suffix(distcode_suffix, sizeof(distcode_suffix));
- snprintf(window->distcode, sizeof(window->distcode), DISTCODE, distcode_lang);
+ snprintf(window->distcode, sizeof(window->distcode), DISTCODE "%s", distcode_lang, distcode_suffix);
if(!window->origcode[0])
{
- snprintf(window->origcode, sizeof(window->origcode), DISTCODE, distcode_lang);
+ memcpy(window->origcode, window->distcode, sizeof(window->origcode));
}
/* XXXRGG: Hack!*/
From dyek at helixcommunity.org Wed Feb 20 14:00:42 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 13:10:28 2008
Subject: [Player-cvs] app/gtk mainapp.cpp, 1.150, 1.151 mainapp-private.h,
1.8, 1.9 Umakefil, 1.106, 1.107
Message-ID:
Update of /cvsroot/player/app/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4523
Modified Files:
mainapp.cpp mainapp-private.h Umakefil
Log Message:
Merge from 205Cay.
Enable post-build editing of distribution channel distcode suffix.
Create a distcode (suffix) file to be appended to distcode.
The file can be edited after build and then repackaged.
All Linux packages now use "LN".
All SunOS packages now use "SL".
Files Added:
player/installer/common/postinst/install_misc.sh - chmod a-x distcode
Files Modified:
player/app/gtk/Umakefil - Create distcode suffix file.
player/app/gtk/mainapp.cpp
player/app/gtk/mainapp-private.h
player/installer/archive/make_tempdir - Copy distcode file.
player/installer/common/postinst/postinst.sh
Refer to the following URL for more information:
http://lists.helixcommunity.org/pipermail/player-dev/2008-February/003318.html
Index: mainapp-private.h
===================================================================
RCS file: /cvsroot/player/app/gtk/mainapp-private.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mainapp-private.h 15 Nov 2007 05:32:21 -0000 1.8
+++ mainapp-private.h 20 Feb 2008 22:00:35 -0000 1.9
@@ -267,9 +267,9 @@
can save them properly when the window is destroyed */
gint x_pos, y_pos;
- /* Real.com declares that these are 7 char's max (+ '\0') */
- gchar distcode[8]; /* Code for player distribution method */
- gchar origcode[8]; /* The original distcode, before any updates/upgrades */
+ // 11 chars + null terminator; need to sync. with DISTCODE_SUFFIX_MAX_CHARS
+ gchar distcode[12]; /* Code for player distribution method */
+ gchar origcode[12]; /* The original distcode, before any updates/upgrades */
/* command line switchs */
gboolean quit_on_done;
Index: Umakefil
===================================================================
RCS file: /cvsroot/player/app/gtk/Umakefil,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- Umakefil 18 Jan 2008 23:03:19 -0000 1.106
+++ Umakefil 20 Feb 2008 22:00:35 -0000 1.107
@@ -49,6 +49,9 @@
# ***** END LICENSE BLOCK *****
#
+import re
+import os
+
UmakefileVersion(2,1)
# XXXNH: even though the version number might be >= 1.0/10.0 we haven't
@@ -80,30 +83,23 @@
project.AddDefines("PACKAGE=\"hxplay\"")
distcode = "HX%s1"
-if sysinfo.platform_qualifier == "redhat8":
- distcode = distcode + "D" # download
-elif sysinfo.platform_qualifier == "nld":
- distcode = distcode + "NL" # Novell Linux Desktop
-elif sysinfo.platform_qualifier == "rhel4":
- distcode = distcode + "RH" # RedHat
-elif sysinfo.platform_qualifier == "fedora3":
- distcode = distcode + "FC" # Fedora
-elif sysinfo.platform_qualifier == "jds3":
- distcode = distcode + "SJ" # Sun Java Desktop
-elif sysinfo.platform_qualifier == "turbo10":
- distcode = distcode + "TL" # Turbo Linux
-elif sysinfo.platform_qualifier == "debian3":
- distcode = distcode + "DG" # Debian/GNU
-elif sysinfo.platform_qualifier == "xandros3":
- distcode = distcode + "XA" # Xandros 3.0
-elif sysinfo.platform_qualifier == "linspire45":
- distcode = distcode + "LI" # Linspire 4.5
-elif sysinfo.platform_qualifier == "linspire5":
- distcode = distcode + "LI" # Linspire 5.0
+if re.search("^linux2", sysinfo.platform):
+ distcode = distcode + "LN" # Linux
+elif re.search("^sunos5", sysinfo.platform):
+ distcode = distcode + "SL" # Solaris
else:
distcode = distcode + "O" # Other
+
project.AddDefines('DISTCODE="' + distcode + '"')
+# Default (distribution channel) discode suffix.
+distcode_suffix = ""
+
+# Create the distcode (suffix) file.
+file = open("distcode", "w")
+file.write(distcode_suffix + "\n")
+file.close()
+
if project.IsDefined('HELIX_FEATURE_GNOME'):
pkg_modules = pkg_modules + " libgnome-2.0 libgnomeui-2.0"
project.AddDefines('USE_GNOME')
@@ -183,15 +179,6 @@
"cr1productidentity.cpp",
"cr1userauthentication.cpp")
-
- # libcurl & glibcurl
- curl_path = GetSDKPath("curl")
-
- project.AddLibraries(os.path.join(curl_path, "lib", "libcrypto.a"))
- project.AddLibraries(os.path.join(curl_path, "lib", "libssl.a"))
- project.AddLibraries(os.path.join(curl_path, "lib", "libcurl.a"))
- project.AddModuleLibraries("common/import/glibcurl[glibcurl]")
-
if not project.IsDefined('HELIX_FEATURE_LIBGLADE'):
project.AddSources("signin_interface.c")
Index: mainapp.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/mainapp.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- mainapp.cpp 27 Dec 2007 00:00:51 -0000 1.150
+++ mainapp.cpp 20 Feb 2008 22:00:35 -0000 1.151
@@ -65,6 +65,12 @@
*/
+#include
+#include
+#include
+#include
+
+
#include "HXClientCFuncs.h"
#include "mainapp.h"
@@ -161,6 +167,10 @@
// Support Help menu entries not supported by real.com switchboard.
#define HELP_MENU_SWITCHBOARD "https://player.helixcommunity.org/sitecode/redirect/?"
+#define DISTCODE_FILE "distcode"
+#define DISTCODE_SUFFIX_MAX_CHARS 3 // Not inclusive of null terminator; arbitrary.
+// The maximum number of chars of distcode is determined by sizeof(window->distcode),
+// not DISTCODE_SUFFIX_MAX_CHARS.
/* Data structures
* ===============
@@ -5136,11 +5146,55 @@
return;
}
+// Read distribution channel distcode suffix from file.
+static gint
+read_distcode_suffix(char *buffer, gssize buffer_size)
+{
+ char *instdir = NULL;
+ char *distcode_path = NULL;
+ int fd = 0;
+ ssize_t bytes_read = 0;
+
+ g_return_val_if_fail(buffer, FALSE);
+ g_return_val_if_fail(buffer_size > 0, FALSE);
+
+ buffer[0] = '\0';
+ instdir = hx_util_get_executable_dir();
+ distcode_path = g_build_filename(instdir, "share", DISTCODE_FILE, NULL); // instdir/share/distcode
+ HX_G_FREE(instdir);
+
+ fd = open(distcode_path, O_RDONLY);
+ HX_G_FREE(distcode_path);
+
+ if (fd < 0)
+ {
+ return 0;
+ }
+
+ bytes_read = read(fd, buffer, buffer_size - 1);
+
+ close(fd);
+ fd = 0;
+
+ if (bytes_read > 0)
+ {
+ buffer[bytes_read] = '\0';
+ g_strstrip(buffer);
+ printf("distcode suffix read = %s\n", buffer);
+ return strlen(buffer);
+ }
+ else
+ {
+ return 0;
+ }
+}
+
HXMainWindow*
hxwindow_new(void)
{
gchar* filename;
GdkPixmap* pixmap;
+ char distcode_suffix[DISTCODE_SUFFIX_MAX_CHARS + 1];
if(!g_hx_main_app)
{
@@ -5275,12 +5329,14 @@
{
distcode_lang = "";
}
+
+ read_distcode_suffix(distcode_suffix, sizeof(distcode_suffix));
- snprintf(window->distcode, sizeof(window->distcode), DISTCODE, distcode_lang);
+ snprintf(window->distcode, sizeof(window->distcode), DISTCODE "%s", distcode_lang, distcode_suffix);
if(!window->origcode[0])
{
- snprintf(window->origcode, sizeof(window->origcode), DISTCODE, distcode_lang);
+ memcpy(window->origcode, window->distcode, sizeof(window->origcode));
}
/* XXXRGG: Hack!*/
From dyek at helixcommunity.org Wed Feb 20 14:05:20 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 13:15:06 2008
Subject: [Player-cvs] installer/common/postinst install_misc.sh, 1.1,
1.2 postinst.sh, 1.6, 1.7
Message-ID:
Update of /cvsroot/player/installer/common/postinst
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8966
Modified Files:
postinst.sh
Added Files:
install_misc.sh
Log Message:
Merge from 205Cay.
Enable post-build editing of distribution channel distcode suffix.
Create a distcode (suffix) file to be appended to distcode.
The file can be edited after build and then repackaged.
All Linux packages now use "LN".
All SunOS packages now use "SL".
Files Added:
player/installer/common/postinst/install_misc.sh - chmod a-x distcode
Files Modified:
player/app/gtk/Umakefil - Create distcode suffix file.
player/app/gtk/mainapp.cpp
player/app/gtk/mainapp-private.h
player/installer/archive/make_tempdir - Copy distcode file.
player/installer/common/postinst/postinst.sh
Refer to the following URL for more information:
http://lists.helixcommunity.org/pipermail/player-dev/2008-February/003318.html
--- NEW FILE: install_misc.sh ---
#!/bin/bash
export ARG0=$0
POSTINST_DIR=${ARG0%/*} # Delete trailing file name.
POSTINST_DIR=$( cd $POSTINST_DIR; pwd )
export POSTINST_DIR
pushd $POSTINST_DIR > /dev/null
. ./functions
DISTCODE_FILE=$INSTDIR/share/distcode
if [ -f $DISTCODE_FILE ]; then
chmod a-w $DISTCODE_FILE
fi
# platform-specific scripts
if [ `uname` = "SunOS" -a -x $INSTDIR/postinst/solarisinst.sh ] ; then
$INSTDIR/postinst/solarisinst.sh $INSTDIR $LOGFILE
fi
popd > /dev/null
Index: postinst.sh
===================================================================
RCS file: /cvsroot/player/installer/common/postinst/postinst.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- postinst.sh 30 Jan 2008 23:13:26 -0000 1.6
+++ postinst.sh 20 Feb 2008 22:05:17 -0000 1.7
@@ -20,6 +20,7 @@
./install_fedora_selinux_workaround.sh
# Shouldn't be using system-wide symbolic link anymore.
./install_system_wide_sym_links_non_LSB.sh
+./install_misc.sh
# TODO: There is no /usr/lib/mozilla/defaults/pref/ directory;
# so this is most likely not needed anymore.
@@ -27,11 +28,5 @@
# ./install_moz_prefs.sh
-# platform-specific scripts
-if [ `uname` = "SunOS" -a -x $INSTDIR/postinst/solarisinst.sh ] ; then
- $INSTDIR/postinst/solarisinst.sh $INSTDIR $LOGFILE
-fi
-
-
popd > /dev/null
From dyek at helixcommunity.org Wed Feb 20 14:07:37 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 13:17:27 2008
Subject: [Player-cvs] installer/archive make_tempdir,1.84,1.85
Message-ID:
Update of /cvsroot/player/installer/archive
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv11780
Modified Files:
make_tempdir
Log Message:
Merge from 205Cay.
Enable post-build editing of distribution channel distcode suffix.
Create a distcode (suffix) file to be appended to distcode.
The file can be edited after build and then repackaged.
All Linux packages now use "LN".
All SunOS packages now use "SL".
Files Added:
player/installer/common/postinst/install_misc.sh - chmod a-x distcode
Files Modified:
player/app/gtk/Umakefil - Create distcode suffix file.
player/app/gtk/mainapp.cpp
player/app/gtk/mainapp-private.h
player/installer/archive/make_tempdir - Copy distcode file.
player/installer/common/postinst/postinst.sh
Refer to the following URL for more information:
http://lists.helixcommunity.org/pipermail/player-dev/2008-February/003318.html
Index: make_tempdir
===================================================================
RCS file: /cvsroot/player/installer/archive/make_tempdir,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- make_tempdir 30 Jan 2008 23:13:28 -0000 1.84
+++ make_tempdir 20 Feb 2008 22:07:35 -0000 1.85
@@ -411,6 +411,10 @@
inst.CopyModuleDll("common/log/logobserverfile", "logobserverfile", "plugins/logobserverfile")
+# Copy distcode file
+inst.CopyFiles(
+ ("../../../player/app/gtk/distcode", "share/distcode"))
+
# mo files (gettext)
inst.MakeDirs("share/locale")
From kreneskyp at helixcommunity.org Wed Feb 20 14:07:42 2008
From: kreneskyp at helixcommunity.org (kreneskyp@helixcommunity.org)
Date: Wed Feb 20 13:17:28 2008
Subject: [Player-cvs] kit/python/hxrecord hxfilter.cpp, 1.1, 1.2 hxfilter.h,
1.1, 1.2 pyfilter.cpp, 1.1, 1.2 pyfilter.h, 1.1,
1.2 pypropertybag.cpp, 1.1, 1.2 pytime.cpp, 1.1, 1.2
Message-ID:
Update of /cvsroot/player/kit/python/hxrecord
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv10768
Modified Files:
hxfilter.cpp hxfilter.h pyfilter.cpp pyfilter.h
pypropertybag.cpp pytime.cpp
Log Message:
Project: player_kit_python_hxrecord
Synopsis:
All python objects in the api are wrappers around an IUnknown. There is a set of base classes all objects derive from that contain generic
setter/getter functions that unwrap/wrap objects passed to them. Currently they handle primitives but not an IUnknown.
Index: pytime.cpp
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/pytime.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pytime.cpp 24 Sep 2007 17:04:26 -0000 1.1
+++ pytime.cpp 20 Feb 2008 22:07:39 -0000 1.2
@@ -301,9 +301,10 @@
sprintf
(
buf,
- "<%s IHXTTime at %lx>",
+ "<%s IHXTTime at %lx, value is %s>",
pytime->m_pHXTime ? "open" : "closed",
- (long)pytime
+ (long)pytime,
+ pytime->m_pHXTime->GetTimeString(true)
);
return PyString_FromString(buf);
}
Index: hxfilter.h
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/hxfilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hxfilter.h 24 Sep 2007 17:04:26 -0000 1.1
+++ hxfilter.h 20 Feb 2008 22:07:39 -0000 1.2
@@ -79,6 +79,7 @@
HX_RESULT SetValue(const char *key, double value);
HX_RESULT SetValue(const char *key, bool value);
HX_RESULT SetValue(const char *key, const char *value);
+ HX_RESULT SetValue(const char *key, IUnknown *value);
/************************************************************************
* IUnknown COM Interface Methods ref: hxcom.h
Index: pypropertybag.cpp
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/pypropertybag.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pypropertybag.cpp 24 Sep 2007 17:04:26 -0000 1.1
+++ pypropertybag.cpp 20 Feb 2008 22:07:39 -0000 1.2
@@ -179,7 +179,32 @@
const char *strValue;
property->GetString(&strValue);
return PyString_FromString(strValue);
- }
+ }
+ else if (type == eTypeUnknown)
+ {
+ IUnknown *pUnknown;
+ property->GetUnknown(&pUnknown);
+
+ if (pUnknown)
+ {
+ IUnknown *pUnknownPtr;
+ //we have the unknown but we need to find out what it is to wrap it
+ if (HXR_OK == pUnknown->QueryInterface(IID_IHXTTime, (void**)&pUnknownPtr))
+ {
+ return PyHxTime_New((IHXTTime*)pUnknownPtr);
+ }
+ else
+ {
+ PyErr_SetString(PyExc_AttributeError, "IUnknown property exists but there conversion to python is not supported");
+ return NULL;
+ }
+ }
+ else
+ {
+ PyErr_SetString(PyExc_AttributeError, "IUnknown property requested but unable to retrieve property from object");
+ return NULL;
+ }
+ }
else
{
PyErr_SetString(PyExc_AttributeError, "property exists but there conversion to python is not supported");
Index: pyfilter.cpp
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/pyfilter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pyfilter.cpp 24 Sep 2007 17:04:26 -0000 1.1
+++ pyfilter.cpp 20 Feb 2008 22:07:39 -0000 1.2
@@ -48,6 +48,7 @@
#include "pyfilter.h"
#include "ihxtbase.h"
#include "pypropertybag.h"
+#include "pytime.h"
#define OFF(x) offsetof(PyFilter, x)
@@ -143,6 +144,10 @@
{
pyfilter->p_hxfilter->SetValue(key, PyString_AsString(value));
}
+ else if (PyHxTime_Check(value))
+ {
+ pyfilter->p_hxfilter->SetValue(key, ((PyHxTime*)value)->m_pHXTime);
+ }
else
{
PyErr_SetString(PyExc_AttributeError, "no conversion for data type given");
Index: hxfilter.cpp
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/hxfilter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hxfilter.cpp 24 Sep 2007 17:04:26 -0000 1.1
+++ hxfilter.cpp 20 Feb 2008 22:07:39 -0000 1.2
@@ -194,6 +194,26 @@
}
/*
+ * Sets a value in the filter. This function has been overloaded for
+ * various types of values (int, double, etc)
+ */
+HX_RESULT
+PyHxFilter::SetValue(const char *key, IUnknown *value)
+{
+ HX_RESULT res = HXR_OK;
+
+ // Get the configuration interface
+ m_pUnknown->AddRef();
+ IHXTConfigurationAgent* pConfigurator = (IHXTConfigurationAgent*)m_pUnknown;
+
+ // set the value
+ res = pConfigurator->SetUnknown(key, value);
+ HX_RELEASE(pConfigurator);
+
+ return res;
+}
+
+/*
* set a Python exception based on the helix code
*/
void
Index: pyfilter.h
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/pyfilter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pyfilter.h 24 Sep 2007 17:04:26 -0000 1.1
+++ pyfilter.h 20 Feb 2008 22:07:39 -0000 1.2
@@ -84,7 +84,7 @@
*/
static int PyFilter_Close(PyFilter *pyfilter)
{
- if (NULL != pyfilter->p_hxfilter)
+ if (pyfilter->p_hxfilter)
{
pyfilter->p_hxfilter->Release();
pyfilter->p_hxfilter = NULL;
From kreneskyp at helixcommunity.org Wed Feb 20 14:09:01 2008
From: kreneskyp at helixcommunity.org (kreneskyp@helixcommunity.org)
Date: Wed Feb 20 13:18:46 2008
Subject: [Player-cvs] kit/python/hxrecord hxfilter.cpp, 1.1,
1.1.8.1 hxfilter.h, 1.1, 1.1.8.1 pyfilter.cpp, 1.1,
1.1.8.1 pyfilter.h, 1.1, 1.1.8.1 pypropertybag.cpp, 1.1,
1.1.8.1 pytime.cpp, 1.1, 1.1.8.1
Message-ID:
Update of /cvsroot/player/kit/python/hxrecord
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv13328
Modified Files:
Tag: hxclient_3_1_0_atlas
hxfilter.cpp hxfilter.h pyfilter.cpp pyfilter.h
pypropertybag.cpp pytime.cpp
Log Message:
Project: player_kit_python_hxrecord
Synopsis:
All python objects in the api are wrappers around an IUnknown. There is a set of base classes all objects derive from that contain generic
setter/getter functions that unwrap/wrap objects passed to them. Currently they handle primitives but not an IUnknown.
Index: pytime.cpp
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/pytime.cpp,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -d -r1.1 -r1.1.8.1
--- pytime.cpp 24 Sep 2007 17:04:26 -0000 1.1
+++ pytime.cpp 20 Feb 2008 22:08:58 -0000 1.1.8.1
@@ -301,9 +301,10 @@
sprintf
(
buf,
- "<%s IHXTTime at %lx>",
+ "<%s IHXTTime at %lx, value is %s>",
pytime->m_pHXTime ? "open" : "closed",
- (long)pytime
+ (long)pytime,
+ pytime->m_pHXTime->GetTimeString(true)
);
return PyString_FromString(buf);
}
Index: hxfilter.h
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/hxfilter.h,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -d -r1.1 -r1.1.8.1
--- hxfilter.h 24 Sep 2007 17:04:26 -0000 1.1
+++ hxfilter.h 20 Feb 2008 22:08:58 -0000 1.1.8.1
@@ -79,6 +79,7 @@
HX_RESULT SetValue(const char *key, double value);
HX_RESULT SetValue(const char *key, bool value);
HX_RESULT SetValue(const char *key, const char *value);
+ HX_RESULT SetValue(const char *key, IUnknown *value);
/************************************************************************
* IUnknown COM Interface Methods ref: hxcom.h
Index: pypropertybag.cpp
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/pypropertybag.cpp,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -d -r1.1 -r1.1.8.1
--- pypropertybag.cpp 24 Sep 2007 17:04:26 -0000 1.1
+++ pypropertybag.cpp 20 Feb 2008 22:08:58 -0000 1.1.8.1
@@ -179,7 +179,32 @@
const char *strValue;
property->GetString(&strValue);
return PyString_FromString(strValue);
- }
+ }
+ else if (type == eTypeUnknown)
+ {
+ IUnknown *pUnknown;
+ property->GetUnknown(&pUnknown);
+
+ if (pUnknown)
+ {
+ IUnknown *pUnknownPtr;
+ //we have the unknown but we need to find out what it is to wrap it
+ if (HXR_OK == pUnknown->QueryInterface(IID_IHXTTime, (void**)&pUnknownPtr))
+ {
+ return PyHxTime_New((IHXTTime*)pUnknownPtr);
+ }
+ else
+ {
+ PyErr_SetString(PyExc_AttributeError, "IUnknown property exists but there conversion to python is not supported");
+ return NULL;
+ }
+ }
+ else
+ {
+ PyErr_SetString(PyExc_AttributeError, "IUnknown property requested but unable to retrieve property from object");
+ return NULL;
+ }
+ }
else
{
PyErr_SetString(PyExc_AttributeError, "property exists but there conversion to python is not supported");
Index: pyfilter.cpp
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/pyfilter.cpp,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -d -r1.1 -r1.1.8.1
--- pyfilter.cpp 24 Sep 2007 17:04:26 -0000 1.1
+++ pyfilter.cpp 20 Feb 2008 22:08:58 -0000 1.1.8.1
@@ -48,6 +48,7 @@
#include "pyfilter.h"
#include "ihxtbase.h"
#include "pypropertybag.h"
+#include "pytime.h"
#define OFF(x) offsetof(PyFilter, x)
@@ -143,6 +144,10 @@
{
pyfilter->p_hxfilter->SetValue(key, PyString_AsString(value));
}
+ else if (PyHxTime_Check(value))
+ {
+ pyfilter->p_hxfilter->SetValue(key, ((PyHxTime*)value)->m_pHXTime);
+ }
else
{
PyErr_SetString(PyExc_AttributeError, "no conversion for data type given");
Index: hxfilter.cpp
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/hxfilter.cpp,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -d -r1.1 -r1.1.8.1
--- hxfilter.cpp 24 Sep 2007 17:04:26 -0000 1.1
+++ hxfilter.cpp 20 Feb 2008 22:08:58 -0000 1.1.8.1
@@ -194,6 +194,26 @@
}
/*
+ * Sets a value in the filter. This function has been overloaded for
+ * various types of values (int, double, etc)
+ */
+HX_RESULT
+PyHxFilter::SetValue(const char *key, IUnknown *value)
+{
+ HX_RESULT res = HXR_OK;
+
+ // Get the configuration interface
+ m_pUnknown->AddRef();
+ IHXTConfigurationAgent* pConfigurator = (IHXTConfigurationAgent*)m_pUnknown;
+
+ // set the value
+ res = pConfigurator->SetUnknown(key, value);
+ HX_RELEASE(pConfigurator);
+
+ return res;
+}
+
+/*
* set a Python exception based on the helix code
*/
void
Index: pyfilter.h
===================================================================
RCS file: /cvsroot/player/kit/python/hxrecord/pyfilter.h,v
retrieving revision 1.1
retrieving revision 1.1.8.1
diff -u -d -r1.1 -r1.1.8.1
--- pyfilter.h 24 Sep 2007 17:04:26 -0000 1.1
+++ pyfilter.h 20 Feb 2008 22:08:58 -0000 1.1.8.1
@@ -84,7 +84,7 @@
*/
static int PyFilter_Close(PyFilter *pyfilter)
{
- if (NULL != pyfilter->p_hxfilter)
+ if (pyfilter->p_hxfilter)
{
pyfilter->p_hxfilter->Release();
pyfilter->p_hxfilter = NULL;
From dyek at helixcommunity.org Wed Feb 20 14:32:46 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 13:42:35 2008
Subject: [Player-cvs] app/gtk Umakefil,1.106.2.1,1.106.2.2
Message-ID:
Update of /cvsroot/player/app/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv2651
Modified Files:
Tag: hxclient_2_0_5_cayenne
Umakefil
Log Message:
Update Version Number to 11 Gold.
Files Modified:
player/app/gtk/Umakefil
Refer to the following URL for more information:
http://lists.helixcommunity.org/pipermail/player-dev/2008-February/003319.html
Index: Umakefil
===================================================================
RCS file: /cvsroot/player/app/gtk/Umakefil,v
retrieving revision 1.106.2.1
retrieving revision 1.106.2.2
diff -u -d -r1.106.2.1 -r1.106.2.2
--- Umakefil 20 Feb 2008 21:51:31 -0000 1.106.2.1
+++ Umakefil 20 Feb 2008 22:32:43 -0000 1.106.2.2
@@ -54,14 +54,7 @@
UmakefileVersion(2,1)
-# XXXNH: even though the version number might be >= 1.0/10.0 we haven't
-# fully tested on all platforms, so display the "gold" label for those that are
-# actually gold and "experimental" for all others.
-
-platform_build_status = "experimental"
-# XXXNH: on the head we're always experimental
-#if sysinfo.id in ("linux-2.2-libc6-gcc32-i586", "linux-2.2-libc6-i386"):
-# platform_build_status = "GOLD"
+platform_build_status = "GOLD"
# RGG: The full resource directory is datadir + package.
# for the tarball installer, this'll do.
@@ -78,10 +71,10 @@
if project.IsDefined('HELIX_FEATURE_REAL_BRANDING'):
project.AddDefines("PACKAGE=\"realplay\"")
- distcode = "RX%s1"
+ distcode = "RX%s11"
else:
project.AddDefines("PACKAGE=\"hxplay\"")
- distcode = "HX%s1"
+ distcode = "HX%s11"
if re.search("^linux2", sysinfo.platform):
distcode = distcode + "LN" # Linux
@@ -178,9 +171,9 @@
"cr1commonclassfactory.cpp",
"cr1productidentity.cpp",
"cr1userauthentication.cpp")
-
- if not project.IsDefined('HELIX_FEATURE_LIBGLADE'):
- project.AddSources("signin_interface.c")
+
+ if not project.IsDefined('HELIX_FEATURE_LIBGLADE'):
+ project.AddSources("signin_interface.c")
# Add includes
project.AddModuleIncludes("common/include",
@@ -276,9 +269,9 @@
path = os.path.join("locale", entry)
if os.path.isdir(path):
src_path = os.path.join(path, readme_src)
- if os.path.isfile(src_path):
- dest_path = os.path.join(path, readme_dest)
- UpdateReleaseNotes(src_path, dest_path, verfile)
+ if os.path.isfile(src_path):
+ dest_path = os.path.join(path, readme_dest)
+ UpdateReleaseNotes(src_path, dest_path, verfile)
# update default release notes
UpdateReleaseNotes(readme_src, readme_dest, verfile)
From dyek at helixcommunity.org Wed Feb 20 16:23:22 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Wed Feb 20 15:33:06 2008
Subject: [Player-cvs] app/gtk Umakefil,1.106.2.2,1.106.2.3
Message-ID:
Update of /cvsroot/player/app/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv9907
Modified Files:
Tag: hxclient_2_0_5_cayenne
Umakefil
Log Message:
Fixed Python white space problem accidentally introduced in previous commit.
Index: Umakefil
===================================================================
RCS file: /cvsroot/player/app/gtk/Umakefil,v
retrieving revision 1.106.2.2
retrieving revision 1.106.2.3
diff -u -d -r1.106.2.2 -r1.106.2.3
--- Umakefil 20 Feb 2008 22:32:43 -0000 1.106.2.2
+++ Umakefil 21 Feb 2008 00:23:19 -0000 1.106.2.3
@@ -172,8 +172,8 @@
"cr1productidentity.cpp",
"cr1userauthentication.cpp")
- if not project.IsDefined('HELIX_FEATURE_LIBGLADE'):
- project.AddSources("signin_interface.c")
+ if not project.IsDefined('HELIX_FEATURE_LIBGLADE'):
+ project.AddSources("signin_interface.c")
# Add includes
project.AddModuleIncludes("common/include",
From weian at helixcommunity.org Wed Feb 20 23:22:19 2008
From: weian at helixcommunity.org (weian@helixcommunity.org)
Date: Wed Feb 20 22:31:59 2008
Subject: [Player-cvs] hxclientkit/src/platform/unix CHXClientEngineUnix.cpp,
1.20.2.2, 1.20.2.3
Message-ID:
Update of /cvsroot/player/hxclientkit/src/platform/unix
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv27994/src/platform/unix
Modified Files:
Tag: hxclient_3_1_0_atlas
CHXClientEngineUnix.cpp
Log Message:
Synopsis:
Make the user configuration data at play level can be passed to plug-ins successfully
Overview:
Pass the pointer of player level (the type is CHXClientEngineContext*) to the media platform when
initiating, so when calling read-preference relevant functions at plug-in can be called back to player lever.
Files Added:
No file added
Files Modified:
CHXClientEngineUnix.cpp: (src/platform/unix/CHXClientEngineUnix.cpp)
Image Size and Heap Use impact (Client -Only):
Little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
hxclientkit-readpref.diff
Index: CHXClientEngineUnix.cpp
===================================================================
RCS file: /cvsroot/player/hxclientkit/src/platform/unix/CHXClientEngineUnix.cpp,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -d -r1.20.2.2 -r1.20.2.3
--- CHXClientEngineUnix.cpp 20 Feb 2008 13:38:30 -0000 1.20.2.2
+++ CHXClientEngineUnix.cpp 21 Feb 2008 07:22:16 -0000 1.20.2.3
@@ -1,6 +1,6 @@
/* ***** BEGIN LICENSE BLOCK *****
* Source last modified: $Id$
- *
+ *
* Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
*
* The contents of this file, and the files included with this file,
@@ -55,7 +55,7 @@
#include "dllpath.h"
#include "hxwintyp.h"
#include
-#include "hxtlogutil.h"
+#include "CHXClientEngineContext.h"
// XXXNH: is there a better place to put this?
#define MAX_PATH 256
@@ -209,6 +209,9 @@
FPHXCREATEMEDIAPLATFORM fpPlatCreate =
(FPHXCREATEMEDIAPLATFORM) m_dllHXCore.getSymbol("HXCreateMediaPlatform");
+ CHXClientEngineContext* pEngineContext = new CHXClientEngineContext( GetClientEngineCallbacks() );
+ SPIUnknown spIUnkEngineContext = pEngineContext->GetUnknown();
+
res = HXR_FAIL;
if( HXR_OK == fpPlatOpen() )
{
@@ -216,7 +219,7 @@
{
res = m_pIMediaPlatform->AddPluginPath("HXClientKitFramework", dllhome);
- if( HXR_OK == m_pIMediaPlatform->Init(NULL) )
+ if( HXR_OK == m_pIMediaPlatform->Init(spIUnkEngineContext.Ptr()) )
{
HX_RELEASE(m_pIPlatformKicker);
res = m_pIMediaPlatform->QueryInterface(IID_IHXMediaPlatformKicker,
@@ -229,6 +232,7 @@
}
}
}
+ HX_RELEASE (pEngineContext);
}
else
{
@@ -350,7 +354,6 @@
void
CHXClientEngineUnix::OnCloseClientEngine(void)
{
- HX_DISABLE_LOGGING(true); // true means the engine is shutdowning.
if (m_pICoreEngine)
{
HX_ASSERT(m_dllHXCore.isOpen());
From weian at helixcommunity.org Wed Feb 20 23:30:55 2008
From: weian at helixcommunity.org (weian@helixcommunity.org)
Date: Wed Feb 20 22:40:34 2008
Subject: [Player-cvs] hxclientkit/src/platform/unix CHXClientEngineUnix.cpp,
1.22, 1.23
Message-ID:
Update of /cvsroot/player/hxclientkit/src/platform/unix
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv11944/src/platform/unix
Modified Files:
CHXClientEngineUnix.cpp
Log Message:
Synopsis:
Make the user configuration data at play level can be passed to plug-ins successfully
Overview:
Pass the pointer of player level (the type is CHXClientEngineContext*) to the media platform when
initiating, so when calling read-preference relevant functions at plug-in can be called back to player lever.
Files Added:
No file added
Files Modified:
CHXClientEngineUnix.cpp: (src/platform/unix/CHXClientEngineUnix.cpp)
Image Size and Heap Use impact (Client -Only):
Little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
hxclientkit-readpref.diff
Index: CHXClientEngineUnix.cpp
===================================================================
RCS file: /cvsroot/player/hxclientkit/src/platform/unix/CHXClientEngineUnix.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- CHXClientEngineUnix.cpp 20 Feb 2008 13:31:51 -0000 1.22
+++ CHXClientEngineUnix.cpp 21 Feb 2008 07:30:52 -0000 1.23
@@ -1,6 +1,6 @@
/* ***** BEGIN LICENSE BLOCK *****
* Source last modified: $Id$
- *
+ *
* Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
*
* The contents of this file, and the files included with this file,
@@ -55,7 +55,7 @@
#include "dllpath.h"
#include "hxwintyp.h"
#include
-#include "hxtlogutil.h"
+#include "CHXClientEngineContext.h"
// XXXNH: is there a better place to put this?
#define MAX_PATH 256
@@ -209,6 +209,9 @@
FPHXCREATEMEDIAPLATFORM fpPlatCreate =
(FPHXCREATEMEDIAPLATFORM) m_dllHXCore.getSymbol("HXCreateMediaPlatform");
+ CHXClientEngineContext* pEngineContext = new CHXClientEngineContext( GetClientEngineCallbacks() );
+ SPIUnknown spIUnkEngineContext = pEngineContext->GetUnknown();
+
res = HXR_FAIL;
if( HXR_OK == fpPlatOpen() )
{
@@ -216,7 +219,7 @@
{
res = m_pIMediaPlatform->AddPluginPath("HXClientKitFramework", dllhome);
- if( HXR_OK == m_pIMediaPlatform->Init(NULL) )
+ if( HXR_OK == m_pIMediaPlatform->Init(spIUnkEngineContext.Ptr()) )
{
HX_RELEASE(m_pIPlatformKicker);
res = m_pIMediaPlatform->QueryInterface(IID_IHXMediaPlatformKicker,
@@ -229,6 +232,7 @@
}
}
}
+ HX_RELEASE (pEngineContext);
}
else
{
@@ -350,7 +354,6 @@
void
CHXClientEngineUnix::OnCloseClientEngine(void)
{
- HX_DISABLE_LOGGING(true); // true means the engine is shutdowning.
if (m_pICoreEngine)
{
HX_ASSERT(m_dllHXCore.isOpen());
From zhuao at helixcommunity.org Wed Feb 20 23:44:31 2008
From: zhuao at helixcommunity.org (zhuao@helixcommunity.org)
Date: Wed Feb 20 22:54:10 2008
Subject: [Player-cvs] hxclientkit/src/platform/unix CHXClientEngineUnix.cpp,
1.23, 1.24
Message-ID:
Update of /cvsroot/player/hxclientkit/src/platform/unix
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv24280/src/platform/unix
Modified Files:
CHXClientEngineUnix.cpp
Log Message:
Synopsis:
HX_ENABLE_LOGGING() was added to CHXClientEngine::CreateEngine recently.
but there is no HX_DISABLE_LOGGING() called in hxclientkit module, it is a bug.
I add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to fix it.
Overview:
HX_ENABLE_LOGGING() was added to CHXClientEngine::CreateEngine recently.
but there is no HX_DISABLE_LOGGING() called in hxclientkit module, it is a bug.
I add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to fix it.
Files Added:
No file added
Files Modified:
CHXClientEngineUnix.cpp: (src/platform/unix/CHXClientEngineUnix.cpp)
add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to close log system.
Image Size and Heap Use impact (Client -Only):
little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
hxclientkit-logutil.diff
Index: CHXClientEngineUnix.cpp
===================================================================
RCS file: /cvsroot/player/hxclientkit/src/platform/unix/CHXClientEngineUnix.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- CHXClientEngineUnix.cpp 21 Feb 2008 07:30:52 -0000 1.23
+++ CHXClientEngineUnix.cpp 21 Feb 2008 07:44:28 -0000 1.24
@@ -56,6 +56,7 @@
#include "hxwintyp.h"
#include
#include "CHXClientEngineContext.h"
+#include "hxtlogutil.h"
// XXXNH: is there a better place to put this?
#define MAX_PATH 256
@@ -354,6 +355,7 @@
void
CHXClientEngineUnix::OnCloseClientEngine(void)
{
+ HX_DISABLE_LOGGING(true); // true means the engine is shutdowning.
if (m_pICoreEngine)
{
HX_ASSERT(m_dllHXCore.isOpen());
From zhuao at helixcommunity.org Wed Feb 20 23:47:33 2008
From: zhuao at helixcommunity.org (zhuao@helixcommunity.org)
Date: Wed Feb 20 22:57:15 2008
Subject: [Player-cvs] hxclientkit/src/platform/unix CHXClientEngineUnix.cpp,
1.20.2.3, 1.20.2.4
Message-ID:
Update of /cvsroot/player/hxclientkit/src/platform/unix
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv31250/src/platform/unix
Modified Files:
Tag: hxclient_3_1_0_atlas
CHXClientEngineUnix.cpp
Log Message:
Synopsis:
HX_ENABLE_LOGGING() was added to CHXClientEngine::CreateEngine recently.
but there is no HX_DISABLE_LOGGING() called in hxclientkit module, it is a bug.
I add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to fix it.
Overview:
HX_ENABLE_LOGGING() was added to CHXClientEngine::CreateEngine recently.
but there is no HX_DISABLE_LOGGING() called in hxclientkit module, it is a bug.
I add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to fix it.
Files Added:
No file added
Files Modified:
CHXClientEngineUnix.cpp: (src/platform/unix/CHXClientEngineUnix.cpp)
add HX_DISABLE_LOGGING() in CHXClientEngineUnix::OnCloseClientEngine() to close log system.
Image Size and Heap Use impact (Client -Only):
little
Platforms and Profiles Affected:
platform: linux-2.2-libc6-gcc32-i586
profile: helix-client-all-defines
Distribution Libraries Affected:
Distribution library impact and planned action:
Platforms and Profiles Build Verified:
Set BIF branch -> hxdbus_3_1_0_atlas
Set Target(s) -> dbus_server_with_video
Set Profile -> helix-client-all-defines
System ID -> linux-2.2-libc6-gcc32-i586
Branch:
HEAD, hxclient_3_1_0_atlas
Copyright assignment:
2. Intel has signed and delivered a Joint Copyright Assignment
to RealNetworks, and received acknowledgment that the
agreement was received.
Files Attached:
hxclientkit-logutil.diff
Index: CHXClientEngineUnix.cpp
===================================================================
RCS file: /cvsroot/player/hxclientkit/src/platform/unix/CHXClientEngineUnix.cpp,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -u -d -r1.20.2.3 -r1.20.2.4
--- CHXClientEngineUnix.cpp 21 Feb 2008 07:22:16 -0000 1.20.2.3
+++ CHXClientEngineUnix.cpp 21 Feb 2008 07:47:28 -0000 1.20.2.4
@@ -56,6 +56,7 @@
#include "hxwintyp.h"
#include
#include "CHXClientEngineContext.h"
+#include "hxtlogutil.h"
// XXXNH: is there a better place to put this?
#define MAX_PATH 256
@@ -354,6 +355,7 @@
void
CHXClientEngineUnix::OnCloseClientEngine(void)
{
+ HX_DISABLE_LOGGING(true); // true means the engine is shutdowning.
if (m_pICoreEngine)
{
HX_ASSERT(m_dllHXCore.isOpen());
From dyek at helixcommunity.org Thu Feb 21 02:02:46 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Thu Feb 21 01:12:38 2008
Subject: [Player-cvs] app/gtk mainapp.cpp,1.150.2.2,1.150.2.3
Message-ID:
Update of /cvsroot/player/app/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv29863
Modified Files:
Tag: hxclient_2_0_5_cayenne
mainapp.cpp
Log Message:
Remove debugging printf statement accidentally checked in.
Index: mainapp.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/mainapp.cpp,v
retrieving revision 1.150.2.2
retrieving revision 1.150.2.3
diff -u -d -r1.150.2.2 -r1.150.2.3
--- mainapp.cpp 20 Feb 2008 21:51:31 -0000 1.150.2.2
+++ mainapp.cpp 21 Feb 2008 10:02:43 -0000 1.150.2.3
@@ -5171,7 +5171,6 @@
{
buffer[bytes_read] = '\0';
g_strstrip(buffer);
- printf("distcode suffix read = %s\n", buffer);
return strlen(buffer);
}
else
From dyek at helixcommunity.org Thu Feb 21 04:15:46 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Thu Feb 21 03:25:28 2008
Subject: [Player-cvs] app/gtk/po de.mo, 1.5, 1.5.32.1 de.po, 1.6,
1.6.2.1 es.mo, 1.3, 1.3.84.1 es.po, 1.4, 1.4.2.1 fr.mo, 1.4,
1.4.82.1 fr.po, 1.5, 1.5.2.1 it.mo, 1.4, 1.4.84.1 it.po, 1.5,
1.5.2.1 ja.mo, 1.3, 1.3.84.1 ja.po, 1.4, 1.4.2.1 ko.mo, 1.4,
1.4.18.1 ko.po, 1.5, 1.5.2.1 pt_BR.mo, 1.3, 1.3.84.1 pt_BR.po,
1.4, 1.4.2.1 zh_CN.mo, 1.4, 1.4.84.1 zh_CN.po, 1.5,
1.5.2.1 zh_TW.mo, 1.4, 1.4.84.1 zh_TW.po, 1.5, 1.5.2.1
Message-ID:
Update of /cvsroot/player/app/gtk/po
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv1093
Modified Files:
Tag: hxclient_2_0_5_cayenne
de.mo de.po es.mo es.po fr.mo fr.po it.mo it.po ja.mo ja.po
ko.mo ko.po pt_BR.mo pt_BR.po zh_CN.mo zh_CN.po zh_TW.mo
zh_TW.po
Log Message:
Removed BOM (Byte Order Mark, U+FEFF) from po files as they caused
msgfmt to fail.
Generated new mo files.
Files Modified:
player/app/gtk/*.mo
player/app/gtk/*.po
Index: it.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/it.po,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- it.po 8 Feb 2008 08:26:56 -0000 1.5
+++ it.po 21 Feb 2008 12:15:43 -0000 1.5.2.1
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: es.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/es.mo,v
retrieving revision 1.3
retrieving revision 1.3.84.1
diff -u -d -r1.3 -r1.3.84.1
Binary files /tmp/cvsyvdvno and /tmp/cvsqY11vE differ
Index: zh_TW.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/zh_TW.mo,v
retrieving revision 1.4
retrieving revision 1.4.84.1
diff -u -d -r1.4 -r1.4.84.1
Binary files /tmp/cvsmbtG2m and /tmp/cvswJKfdD differ
Index: it.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/it.mo,v
retrieving revision 1.4
retrieving revision 1.4.84.1
diff -u -d -r1.4 -r1.4.84.1
Binary files /tmp/cvsQPI5Ln and /tmp/cvsxoqIYD differ
Index: de.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/de.po,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- de.po 8 Feb 2008 08:26:56 -0000 1.6
+++ de.po 21 Feb 2008 12:15:43 -0000 1.6.2.1
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: pt_BR.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/pt_BR.po,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- pt_BR.po 8 Feb 2008 08:26:56 -0000 1.4
+++ pt_BR.po 21 Feb 2008 12:15:43 -0000 1.4.2.1
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: ko.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/ko.mo,v
retrieving revision 1.4
retrieving revision 1.4.18.1
diff -u -d -r1.4 -r1.4.18.1
Binary files /tmp/cvsBvF7Uy and /tmp/cvskFDpuP differ
Index: pt_BR.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/pt_BR.mo,v
retrieving revision 1.3
retrieving revision 1.3.84.1
diff -u -d -r1.3 -r1.3.84.1
Binary files /tmp/cvsUuLYBx and /tmp/cvsw5igdO differ
Index: es.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/es.po,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- es.po 8 Feb 2008 08:26:56 -0000 1.4
+++ es.po 21 Feb 2008 12:15:43 -0000 1.4.2.1
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: ja.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/ja.po,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- ja.po 8 Feb 2008 08:26:56 -0000 1.4
+++ ja.po 21 Feb 2008 12:15:43 -0000 1.4.2.1
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: zh_TW.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/zh_TW.po,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- zh_TW.po 8 Feb 2008 08:26:56 -0000 1.5
+++ zh_TW.po 21 Feb 2008 12:15:43 -0000 1.5.2.1
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: ja.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/ja.mo,v
retrieving revision 1.3
retrieving revision 1.3.84.1
diff -u -d -r1.3 -r1.3.84.1
Binary files /tmp/cvseef9Yr and /tmp/cvsGGFXKI differ
Index: zh_CN.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/zh_CN.mo,v
retrieving revision 1.4
retrieving revision 1.4.84.1
diff -u -d -r1.4 -r1.4.84.1
Binary files /tmp/cvs0zhNkv and /tmp/cvsZv2D8L differ
Index: fr.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/fr.po,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- fr.po 8 Feb 2008 08:26:56 -0000 1.5
+++ fr.po 21 Feb 2008 12:15:43 -0000 1.5.2.1
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: fr.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/fr.mo,v
retrieving revision 1.4
retrieving revision 1.4.82.1
diff -u -d -r1.4 -r1.4.82.1
Binary files /tmp/cvs1man7w and /tmp/cvsgaR0ZN differ
Index: de.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/de.mo,v
retrieving revision 1.5
retrieving revision 1.5.32.1
diff -u -d -r1.5 -r1.5.32.1
Binary files /tmp/cvspZ2r0A and /tmp/cvsdWc78R differ
Index: ko.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/ko.po,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- ko.po 8 Feb 2008 08:26:56 -0000 1.5
+++ ko.po 21 Feb 2008 12:15:43 -0000 1.5.2.1
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: zh_CN.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/zh_CN.po,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- zh_CN.po 8 Feb 2008 08:26:56 -0000 1.5
+++ zh_CN.po 21 Feb 2008 12:15:43 -0000 1.5.2.1
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
From dyek at helixcommunity.org Thu Feb 21 12:15:36 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
Date: Thu Feb 21 11:25:07 2008
Subject: [Player-cvs] app/gtk/po de.mo, 1.5, 1.6 de.po, 1.6, 1.7 es.mo, 1.3,
1.4 es.po, 1.4, 1.5 fr.mo, 1.4, 1.5 fr.po, 1.5, 1.6 it.mo, 1.4,
1.5 it.po, 1.5, 1.6 ja.mo, 1.3, 1.4 ja.po, 1.4, 1.5 ko.mo, 1.4,
1.5 ko.po, 1.5, 1.6 pt_BR.mo, 1.3, 1.4 pt_BR.po, 1.4,
1.5 zh_CN.mo, 1.4, 1.5 zh_CN.po, 1.5, 1.6 zh_TW.mo, 1.4,
1.5 zh_TW.po, 1.5, 1.6
Message-ID:
Update of /cvsroot/player/app/gtk/po
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv6609
Modified Files:
de.mo de.po es.mo es.po fr.mo fr.po it.mo it.po ja.mo ja.po
ko.mo ko.po pt_BR.mo pt_BR.po zh_CN.mo zh_CN.po zh_TW.mo
zh_TW.po
Log Message:
Merge from 205Cay.
Removed BOM (Byte Order Mark, U+FEFF) from po files as they caused
msgfmt to fail.
Generated new mo files.
Refer to the following URL for more information:
http://lists.helixcommunity.org/pipermail/player-dev/2008-February/003324.html
Index: it.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/it.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- it.po 8 Feb 2008 08:26:56 -0000 1.5
+++ it.po 21 Feb 2008 20:15:32 -0000 1.6
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: es.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/es.mo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsCaTLbS and /tmp/cvsjnOvGu differ
Index: zh_TW.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/zh_TW.mo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvsY1vLvS and /tmp/cvsU0I31u differ
Index: it.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/it.mo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvshfUQQQ and /tmp/cvsOzJoot differ
Index: de.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/de.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- de.po 8 Feb 2008 08:26:56 -0000 1.6
+++ de.po 21 Feb 2008 20:15:32 -0000 1.7
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: pt_BR.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/pt_BR.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pt_BR.po 8 Feb 2008 08:26:56 -0000 1.4
+++ pt_BR.po 21 Feb 2008 20:15:32 -0000 1.5
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: ko.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/ko.mo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvszGhN5S and /tmp/cvsqM3iJv differ
Index: pt_BR.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/pt_BR.mo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsRJSeOT and /tmp/cvs7TF0sw differ
Index: es.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/es.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- es.po 8 Feb 2008 08:26:56 -0000 1.4
+++ es.po 21 Feb 2008 20:15:32 -0000 1.5
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: ja.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/ja.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ja.po 8 Feb 2008 08:26:56 -0000 1.4
+++ ja.po 21 Feb 2008 20:15:32 -0000 1.5
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: zh_TW.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/zh_TW.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- zh_TW.po 8 Feb 2008 08:26:56 -0000 1.5
+++ zh_TW.po 21 Feb 2008 20:15:32 -0000 1.6
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: ja.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/ja.mo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsHQ3JUQ and /tmp/cvsebKGKt differ
Index: zh_CN.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/zh_CN.mo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvsNxd5xR and /tmp/cvsffnnpu differ
Index: fr.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/fr.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- fr.po 8 Feb 2008 08:26:56 -0000 1.5
+++ fr.po 21 Feb 2008 20:15:32 -0000 1.6
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: fr.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/fr.mo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvsGWrmmQ and /tmp/cvsiVbYgt differ
Index: de.mo
===================================================================
RCS file: /cvsroot/player/app/gtk/po/de.mo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
Binary files /tmp/cvsEdURkT and /tmp/cvsBXA5gw differ
Index: ko.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/ko.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ko.po 8 Feb 2008 08:26:56 -0000 1.5
+++ ko.po 21 Feb 2008 20:15:32 -0000 1.6
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
Index: zh_CN.po
===================================================================
RCS file: /cvsroot/player/app/gtk/po/zh_CN.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- zh_CN.po 8 Feb 2008 08:26:56 -0000 1.5
+++ zh_CN.po 21 Feb 2008 20:15:32 -0000 1.6
@@ -1,4 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
From umakanth at helixcommunity.org Thu Feb 21 15:44:16 2008
From: umakanth at helixcommunity.org (umakanth@helixcommunity.org)
Date: Thu Feb 21 14:53:46 2008
Subject: [Player-cvs] app/gtk/locale/zh_TW README.realplay.in,1.4,1.5
Message-ID:
Update of /cvsroot/player/app/gtk/locale/zh_TW
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv27672
Modified Files:
README.realplay.in
Log Message:
Replacing the incorrect README 1.4 with dyek's correct README v1.3
Index: README.realplay.in
===================================================================
RCS file: /cvsroot/player/app/gtk/locale/zh_TW/README.realplay.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- README.realplay.in 12 Feb 2008 00:13:44 -0000 1.4
+++ README.realplay.in 21 Feb 2008 23:44:12 -0000 1.5
@@ -1,57 +1,66 @@
+
+ RealPlayer %version% for Linux
- RealPlayer 10 for Linux
+ 版本說明
- 正式版說明
+ 2008 年 3 月
- 2004 年 8 月
- 系統需求
+RealPlayer %version% for Linux 是一種桌面媒體播放程式，支援 RealAudio、RealVideo、MP3、Flash、MPEG-4 (收費)、Windows Media 及其他非開放原始碼元件。
- * 350MHz Intel Pentium II 或同級處理器
- * 64MB 記憶體
- * 23 MB 可用硬碟空間
- * 28.8Kbps 數據機 (僅音訊)
- * OSS 驅動程式支援的音效卡
+ 最低系統需求
+
+ * 500MHz Intel Pentium III 或同級處理器
+ * 256MB 記憶體
+ * 30 MB 可用硬碟空間
+ * 28.8Kbps 數據機
+ * ALSA 或 OSS 驅動程式支援的音效卡
* 65,000 色顯示卡，解析度設定為 800x600 (視訊)
- 正式版的新功能
+ 建議系統需求
- Linux 版的 RealPlayer 10
- 包含了針對舊版播放程式所開發出之許多新功能
- 與改進。 特別值得注意的功能如下：
- * 支援最新的 RealAudio 與 RealVideo 編碼/解碼器
- * 支援 Vorbis 與 Theora 編碼/解碼器
- * 硬體加速視訊
- * 以 GTK 為基礎的最新介面
+ * 1.5 GHz Intel Pentium IV 或同級處理器
+ * 512MB 記憶體
+ * 30 MB 可用硬碟空間
+ * 高速網際網路連線
+ * OSS/ALSA 驅動程式支援的音效卡
+ * 16 色顯示卡，解析度設定為 1024x768
+
+ 此為 RealPlayer %version% 版讀我檔案。 此檔案會隨資訊之增加而修改，因此請務必定期造訪我們的網站，查看是否有新資訊與更新資訊。
+
+ %version% 版的新功能
+
+ * Windows Media 解碼器。
+ * 播放清單支援。
+ * PerfectPlay (超級緩衝)。
+ * ALSA 音訊裝置支援。
+ * 環繞音效播放支援。
+
+ 此版本還包含了針對過去推出的重要版本所作之修正與改進。 本版本之開發重點在於穩定各項功能、並修正許多已知問題與錯誤。
已知問題
- * 如果在播放媒體時發生問題，
- 且在代理伺服器的後方，
- 您可嘗試僅透過 HTTP 使用 RTSP 傳輸設定：
- 移至偏好設定的傳輸面板，選擇
- 「use specified transport (使用指定傳輸)」並按一下
- 「configure rtsp (設定 RTSP)」。然後取消核取
- 「attempt multicast (嘗試組播)」、
- 「attempt udp (嘗試 UDP)」與
- 「attempt tcp (嘗試 TCP)」。
- * 以 GTK 舊版管理最愛時，
- 快顯功能表可能無法作用。
- * 如果 RealPlayer 8 已透過 rpm 安裝在系統上，
- 在安裝 RealPlayer 10 之前，RealPlayer 10 rpm
- 不會移除 RealPlayer 8。 這表示 RealPlayer 8 與
- RealPlayer 10 會並存在同一個系統上。
- 如果此組態導致內嵌的播放程式 (外掛程式)
- 發生問題，請從 Mozilla 外掛程式目錄中刪除
- rpnp.so 檔案。 (問題 #2678)
- * 在 RealAudio 3 中編碼的部分內容無法播放。
- 使用 RA3 作為音訊編碼/解碼器的多媒體內容，
- 沒有音訊仍能播放。 RA3 已被取代。
- * 播放程式無法播放 gnome-vfs URI (smb://)。
- 暫時的解決方法是使用 smbmount 等程式掛上
- Samba 共用 (問題 #2269)。
- * Alsa 與 esound 的驅動程式並未包含在此版本中
- + 使用 AUDIO 環境變數即可設定用於播放的 OSS
- 裝置。 例如：匯出 AUDIO=/dev/dsp2
- * 請參閱 Helix Player 錯誤紀錄，
- 取得影響播放程式的最新問題之清單。
+ * 「Previous (上一步)」與「Next (下一步)」按鈕可能會被停用，需要切換「Continuous (連續)」核取方塊以重新啟用。
+ * 不支援高解析度 Windows Media。
+ * 如果在播放媒體時發生問題，且在代理伺服器的後方，您可嘗試僅透過 HTTP 使用 RTSP 傳輸設定：移至偏好設定的傳輸面板，選擇「use specified transport (使用指定的傳輸埠)」並按一下「configure rtsp (設定 RTSP)」。然後取消核取「attempt multicast (嘗試使用多點傳播)」、「attempt udp (嘗試使用 UDP)」與「attempt tcp (嘗試使用 TCP)」。
+ * 在 RealAudio 3 中編碼的部分內容無法播放。 使用 RA3 作為音訊編碼/解碼器的多媒體內容，沒有音訊仍能播放。 RA3 已被取代。
+ * 播放程式無法播放 gnome-vfs URI (smb://)。 暫時的解決方法是使用 smbmount 等程式掛上 Samba 共用 (問題 #2269)。
+ * 請參閱 Helix Player 錯誤紀錄，取得影響播放程式的最新問題之清單。
+ * UDPPort 偏好設定的數值 (若使用) 必須設定成範圍，例如：
+
+ UseUDPPort=1
+ UDPPort=7000-7010
+
+ 將數值設定成單一數字會導致播放程式當掉。
+
+技術支援
+
+ http://service.real.com 提供 RealPlayer for Linux 的支援頁。 按一下
+ 「RealPlayer」，然後從下拉式清單選擇「RealPlayer 11 for Linux/Unix」。
+
+ 要聯繫開發團隊，請將電子郵件寄至 users@player.helixcommunity.org。
+
+ 您可以查看 Helix Player 專案中的播放程式說明頁：
+ http://player.helixcommunity.org
+
+ 感謝您使用 RealPlayer！
From dyek at helixcommunity.org Thu Feb 21 15:59:41 2008
From: dyek at helixcommunity.org (dyek@helixcommunity.org)
D